Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStaffStatServiceImpl.java

@@ -26,9 +26,6 @@ import java.util.List;
 @Service("attendanceStaffStatService")
 public class AttendanceStaffStatServiceImpl extends AbstractCRUDServiceImpl<AttendanceStaffStatDao, AttendanceStaffStatEntity, Long> implements AttendanceStaffStatService {
 
-    @Autowired
-    private AttendanceRecordDetailDao attendanceRecordDetailDao;
-
     @Override
     public List<AttendanceStaffStatEntity> getListExt(AttendanceSummaryQuery params) throws AppException {
         if(params==null){
@@ -42,7 +39,7 @@ public class AttendanceStaffStatServiceImpl extends AbstractCRUDServiceImpl<Atte
         }
 
         List<AttendanceStaffStatEntity> list = dao.getListExt(params);
-        if(CollectionUtils.isNotEmpty(list)){
+/*        if(CollectionUtils.isNotEmpty(list)){
             for(AttendanceStaffStatEntity entity:list){
                 AttendanceRecordQuery query = new AttendanceRecordQuery();
                 query.setStaffId(entity.getStaffId());
@@ -52,7 +49,7 @@ public class AttendanceStaffStatServiceImpl extends AbstractCRUDServiceImpl<Atte
                 List<AttendanceRecordDetailEntity> entityList = attendanceRecordDetailDao.getListByWhere(query);
                 entity.setAttendanceRecordDetail(entityList);
             }
-        }
+        }*/
         return list;
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java

 package com.mortals.xhx.module.attendance.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
@@ -20,9 +21,7 @@ import com.mortals.xhx.module.attendance.model.vo.AttendanceSummaryQuery;
 import com.mortals.xhx.module.attendance.model.vo.ErrorSummaryVo;
 import com.mortals.xhx.module.attendance.model.vo.LeaveSummaryVo;
 import com.mortals.xhx.module.attendance.model.vo.VacationBalanceSummaryVo;
-import com.mortals.xhx.module.attendance.service.AttendanceLeaveRecordService;
-import com.mortals.xhx.module.attendance.service.AttendanceRecordService;
-import com.mortals.xhx.module.attendance.service.AttendanceStaffStatService;
+import com.mortals.xhx.module.attendance.service.*;
 import com.mortals.xhx.module.dept.model.DeptQuery;
 import com.mortals.xhx.module.dept.service.DeptService;
 import com.mortals.xhx.module.holiday.model.HolidayEntity;
@@ -39,7 +38,7 @@ import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.xhx.module.attendance.dao.AttendanceStatDao;
-import com.mortals.xhx.module.attendance.service.AttendanceStatService;
+import org.springframework.util.ObjectUtils;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -71,6 +70,8 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
 
     @Autowired
     private AttendanceRecordService recordService;
+    @Autowired
+    private AttendanceRecordDetailService attendanceRecordDetailService;
 
     @Autowired
     private AttendanceLeaveRecordService leaveRecordService;
@@ -275,6 +276,20 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                     staffStat.initAttrValue();
                     BeanUtils.copyProperties(item, staffStat, BeanUtil.getNullPropertyNames(item));
                     staffStat.setAttendanceSummary(attendanceSummary);
+
+                    if (!ObjectUtils.isEmpty(attendanceSummary)) {
+                        //todo 保存详细json信息到remark
+                        AttendanceRecordDetailQuery detailQuery = new AttendanceRecordDetailQuery();
+                        detailQuery.setStaffId(staffStat.getStaffId());
+                        //格式化年月日
+                        String date = staffStat.getYear() + "-" + StrUtil.padPre(staffStat.getMonth() + "", 2, "0") + StrUtil.padPre(staffStat.getDay() + "", 2, "0");
+                        detailQuery.setCreateTimeStart(date);
+                        detailQuery.setCreateTimeEnd(date);
+                        List<AttendanceRecordDetailEntity> detailEntities = attendanceRecordDetailService.find(detailQuery);
+                        if (!ObjectUtils.isEmpty(detailEntities)) {
+                            staffStat.setRemark(JSON.toJSONString(detailEntities));
+                        }
+                    }
                     AttendanceStaffStatEntity staffStatTemp = attendanceStaffStatService.selectOne(new AttendanceStaffStatQuery().staffId(item.getStaffId()).year(item.getYear()).month(item.getMonth()).day(item.getDay()));
                     if (staffStatTemp != null) {
                         staffStat.setId(staffStatTemp.getId());