优化考勤代码

service-common/src/main/java/com/java110/common/cmd/attendanceClasses/AttendanceReplenishCheckInCmd.java

@@ -30,6 +30,7 @@ import com.java110.po.attendanceClassesTask.AttendanceClassesTaskPo;
 import com.java110.po.attendanceClassesTaskDetail.AttendanceClassesTaskDetailPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.DateUtil;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -86,6 +87,7 @@ public class AttendanceReplenishCheckInCmd extends Cmd {
         attendanceClassesTaskDetailPo.setDetailId(attendanceClassesTaskDetailDtos.get(0).getDetailId());
         attendanceClassesTaskDetailPo.setState(AttendanceClassesTaskDetailDto.STATE_REPLENISH);
         attendanceClassesTaskDetailPo.setRemark(reqJson.getString("remark"));
+        attendanceClassesTaskDetailPo.setCheckTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         int flag = attendanceClassesTaskDetailInnerServiceSMOImpl.updateAttendanceClassesTaskDetail(attendanceClassesTaskDetailPo);
 
         if (flag < 1) {
@@ -100,9 +102,9 @@ public class AttendanceReplenishCheckInCmd extends Cmd {
         int count = attendanceClassesTaskDetailInnerServiceSMOImpl.queryAttendanceClassesTaskDetailsCount(attendanceClassesTaskDetailDto);
         AttendanceClassesTaskPo attendanceClassesTaskPo = new AttendanceClassesTaskPo();
         attendanceClassesTaskPo.setTaskId(attendanceClassesTaskDetailDtos.get(0).getTaskId());
-        if(count >0){
+        if (count > 0) {
             attendanceClassesTaskPo.setState(AttendanceClassesTaskDto.STATE_DOING);
-        }else{
+        } else {
             attendanceClassesTaskPo.setState(AttendanceClassesTaskDto.STATE_FINISH);
         }
 

service-job/src/main/java/com/java110/job/export/adapt/MonthAttendanceAdapt.java

@@ -37,7 +37,7 @@ public class MonthAttendanceAdapt implements IExportDataAdapt {
         workbook = new SXSSFWorkbook();
         workbook.setCompressTempFiles(false);
 
-        Sheet sheet = workbook.createSheet("月考勤表");
+        Sheet sheet = workbook.createSheet(reqJson.getIntValue("taskYear") + "年" + reqJson.getIntValue("taskMonth") + "月考勤表");
         Row row = sheet.createRow(0);
         row.createCell(0).setCellValue("部门");
         row.createCell(1).setCellValue("员工");
@@ -100,16 +100,16 @@ public class MonthAttendanceAdapt implements IExportDataAdapt {
             dayObj = attendanceClassesTaskDto.getDays();
             for (int day = 1; day <= maxDayOfMonth; day++) {
                 if (!dayObj.containsKey(day)) {
-                    row.createCell(day + 1).setCellValue("无需考勤");
+                    row.createCell(day + 1).setCellValue("休息");
                     continue;
                 }
                 if (dayObj.get(day) == null) {
-                    row.createCell(day + 1).setCellValue("无需考勤");
+                    row.createCell(day + 1).setCellValue("休息");
                     continue;
                 }
                 detailDtos = (List<AttendanceClassesTaskDetailDto>) dayObj.get(day);
                 if (detailDtos == null || detailDtos.size() < 1) {
-                    row.createCell(day + 1).setCellValue("无需考勤");
+                    row.createCell(day + 1).setCellValue("休息");
                     continue;
                 }