diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java index 62ab300..97a700a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java @@ -256,7 +256,7 @@ public class WgzAppController { @ApiOperation("【日报】【日报日历】日报日历·查看日报") //@PreAuthorize("@ss.hasPermi('wgzApp:user:userCheckDailyNewspaper')") @GetMapping("/WgzUserCheckDailyNewspaper/{id}") - public AjaxResult userCheckDailyNewspaper(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { + public AjaxResult userCheckDailyNewspaper(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return AjaxResult.success(iWgzDailyClockService.userCheckDailyNewspaper(id)); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppCheckDailyNewspaperRes.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppCheckDailyNewspaperRes.java new file mode 100644 index 0000000..7ebed1f --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppCheckDailyNewspaperRes.java @@ -0,0 +1,91 @@ +package com.ruoyi.wgz.bo.res; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; + +@Data +@NoArgsConstructor +@Accessors(chain = true) +@ApiModel("日报日历·查看日报列表返回对象") +public class WgzAppCheckDailyNewspaperRes implements Serializable { + @ApiModelProperty("自增ID") + private Long id; + + @ApiModelProperty("项目ID") + private Long recruitId; + + @ApiModelProperty("人员ID") + private Long userId; + + @ApiModelProperty("日报时间") + private LocalDateTime dilyTime; + + @ApiModelProperty("日报标记") + private Integer dailyMark; + + @ApiModelProperty("日报位置") + private String pnchOsition; + + @ApiModelProperty("今日完成工作") + private String finishToday; + + @ApiModelProperty("未完成工作") + private String unfinished; + + @ApiModelProperty("明日工作") + private String workTomorrow; + + @ApiModelProperty("协调与帮助") + private String coordinate; + + @ApiModelProperty("附件,多个逗号分隔") + private String attachment; + + @ApiModelProperty("审核人ID") + private Long auditorUserId; + + @ApiModelProperty("审核状态(0未读 1未审核 2已审核)") + private String auditorType; + + @ApiModelProperty("审核意见") + private String auditorOpinion; + + @ApiModelProperty("未审核|审核时间") + private LocalDateTime auditorTime; + + @ApiModelProperty("删除标志(0代表存在 2代表删除)") + private String delFlag; + + @ApiModelProperty("创建者") + private String createBy; + + @ApiModelProperty("创建时间") + private LocalDateTime createTime; + + @ApiModelProperty("更新者") + private String updateBy; + + @ApiModelProperty("更新时间") + private LocalDateTime updateTime; + + @ApiModelProperty("备注") + private String remark; + + @ApiModelProperty("姓名") + private String username; + + @ApiModelProperty("头像地址") + private String avatarName; + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzDailyClockService.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzDailyClockService.java index b5657d1..506a780 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzDailyClockService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzDailyClockService.java @@ -10,6 +10,7 @@ import com.ruoyi.wgz.bo.WgzDailyClockQueryBo; import com.ruoyi.wgz.bo.req.WgzAppDailyCalendarReq; import com.ruoyi.wgz.bo.req.WgzAppDailyClockReq; import com.ruoyi.wgz.bo.req.WgzAppDailyRecordReq; +import com.ruoyi.wgz.bo.res.WgzAppCheckDailyNewspaperRes; import com.ruoyi.wgz.bo.res.WgzAppUserDailyRecordRes; import com.ruoyi.wgz.bo.res.WgzUserDailyCalendarRes; import com.ruoyi.wgz.domain.WgzDailyClock; @@ -88,7 +89,7 @@ public interface IWgzDailyClockService extends IServicePlus { /** * 日报日历·查看日报 */ - WgzDailyClock userCheckDailyNewspaper(Long id); + WgzAppCheckDailyNewspaperRes userCheckDailyNewspaper(Long id); /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java index 47a0add..aed4b87 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java @@ -24,6 +24,7 @@ import com.ruoyi.wgz.bo.WgzDailyClockQueryBo; import com.ruoyi.wgz.bo.req.WgzAppDailyCalendarReq; import com.ruoyi.wgz.bo.req.WgzAppDailyClockReq; import com.ruoyi.wgz.bo.req.WgzAppDailyRecordReq; +import com.ruoyi.wgz.bo.res.WgzAppCheckDailyNewspaperRes; import com.ruoyi.wgz.bo.res.WgzAppUserDailyRecordRes; import com.ruoyi.wgz.bo.res.WgzUserDailyCalendarRes; import com.ruoyi.wgz.bo.rests.WgzAppAttachmentAcquisitionTwo; @@ -170,9 +171,11 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl