添加若尔盖配置pom参数

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordController.java

@@ -348,6 +348,34 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
                 .sorted(Comparator.comparingInt(AttendanceRecordDetailEntity::getOrderNum))
                 .collect(Collectors.toList());
         List<AttDsyncColumn> dsyncColumns = new ArrayList<>();
+
+
+        for (int i = 1; i <= collect.size(); i++) {
+            AttDsyncColumn attDsyncColumn = new AttDsyncColumn();
+            attDsyncColumn.setName(String.format("上班%s打卡时间", i));
+            attDsyncColumn.setProperty("goWorkDate");
+            attDsyncColumn.setOrderNum(i);
+            dsyncColumns.add(attDsyncColumn);
+
+            attDsyncColumn = new AttDsyncColumn();
+            attDsyncColumn.setName(String.format("上班%s打卡结果", i));
+            attDsyncColumn.setProperty("goWorkResult");
+            attDsyncColumn.setOrderNum(i);
+            dsyncColumns.add(attDsyncColumn);
+
+            attDsyncColumn = new AttDsyncColumn();
+            attDsyncColumn.setName(String.format("下班%s打卡时间", i));
+            attDsyncColumn.setProperty("offWorkDate");
+            attDsyncColumn.setOrderNum(i);
+            dsyncColumns.add(attDsyncColumn);
+
+            attDsyncColumn = new AttDsyncColumn();
+            attDsyncColumn.setName(String.format("下班%s打卡结果",i));
+            attDsyncColumn.setProperty("offWorkResult");
+            attDsyncColumn.setOrderNum(i);
+            dsyncColumns.add(attDsyncColumn);
+        }
+/*
         collect.forEach(item -> {
             AttDsyncColumn attDsyncColumn = new AttDsyncColumn();
             attDsyncColumn.setName(String.format("上班%s打卡时间", item.getOrderNum()));
@@ -372,7 +400,7 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
             attDsyncColumn.setProperty("offWorkResult");
             attDsyncColumn.setOrderNum(item.getOrderNum());
             dsyncColumns.add(attDsyncColumn);
-        });
+        });*/
         Set<Integer> dsyncSet = dsyncColumns.stream().map(i -> i.getOrderNum()).collect(Collectors.toSet());
         //填充空的detail 对象
         Iterator<AttendanceRecordEntity> iterator = list.iterator();
@@ -399,57 +427,6 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
             }
         }
         model.put("dyncColumns", dsyncColumns);
-       /* //出勤情况
-        //总人数
-        Integer total = (Integer)model.get("total");
-        //未出勤
-        Integer noAtt = 0;
-        //迟到
-        Integer beLate = 0;
-        //早退
-        Integer leaveEarly = 0;
-        //缺卡
-        Integer lackOfCards = 0;
-        for (AttendanceRecordEntity attendanceRecordEntity : list) {
-            boolean a = true;
-            for (AttendanceRecordDetailEntity item : attendanceRecordEntity.getAttendanceRecordDetailList()) {
-                if (item.getGoWorkResult()==3){
-                    lackOfCards=lackOfCards+1;
-                }
-                if (item.getGoWorkResult()==4){
-                    beLate = beLate+1;
-                }
-                if (item.getOffWorkResult()==3){
-                    lackOfCards=lackOfCards+1;
-                }
-                if (item.getOffWorkResult()==5){
-                    leaveEarly = leaveEarly +1;
-                }
-                if (item.getGoWorkResult()!=3 || item.getOffWorkResult()!=3){
-                    a  = false;
-                }
-            }
-            if (a){
-                noAtt = noAtt+1;
-            }
-        }
-
-        String attPercentage = "";
-        if (total!=0){
-            float l = ((total - noAtt) / total)*100;
-            attPercentage =l+"%";
-        }else {
-            attPercentage = "0";
-        }
-        AttendanceStatus attendanceStatus = new AttendanceStatus();
-        attendanceStatus.setNeedAttNum(total);
-        attendanceStatus.setAttPercentage(attPercentage);
-        attendanceStatus.setNoAtt(noAtt);
-        attendanceStatus.setBeLate(beLate);
-        attendanceStatus.setLeaveEarly(leaveEarly);
-        attendanceStatus.setLackOfCards(lackOfCards);
-        model.put("attendanceStatus",attendanceStatus);*/
-
         return super.doListAfter(query, model, context);
     }