修改bug

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;
+
+}

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> {
 	/**
 	 * 日报日历·查看日报
 	 */
-	WgzDailyClock userCheckDailyNewspaper(Long id);
+	WgzAppCheckDailyNewspaperRes userCheckDailyNewspaper(Long id);
 
 
 	/**

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<WgzDailyClockMappe
 						setId(wgzDailyClock.getId()).
 						setDilyTime(wgzDailyClock.getDilyTime()).
 						setPnchOsition(wgzDailyClock.getPnchOsition());
-					if (ll.get(clockDate).equals(clockDate)) {
+
+					if (ll.get(date) !=null && ll.get(date).equals(clockDate)) {
 						wgzAppAttachmentAcquisitionTwo.setStatus("2"); //全天请假
 					}
+
 					fh.put(date.toString(),wgzAppAttachmentAcquisitionTwo);
 				}
 			});
@@ -218,8 +221,15 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl<WgzDailyClockMappe
     }
 
 	@Override
-	public WgzDailyClock userCheckDailyNewspaper(Long id) {
-		return getById(id);
+	public WgzAppCheckDailyNewspaperRes userCheckDailyNewspaper(Long id) {
+		WgzAppCheckDailyNewspaperRes res = new WgzAppCheckDailyNewspaperRes();
+		//1、获取当前日报的信息
+		WgzDailyClock byId = getById(id);
+		BeanUtils.copyProperties(byId,res);
+		//2、获取日报的审核人信息
+		BgtUser by = userService.selectUserByUserId(byId.getAuditorUserId());
+		res.setAvatarName(by.getAvatarName()).setUsername(by.getUsername());
+		return res;
 	}
 
 	@Override