Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue

@@ -165,6 +165,18 @@ export default {
     },
     // 处理
     handleArr(arr, currentTime) {
+      // 处理createTime相同的数据
+      for (let i = 0; i < arr.length; i++) {
+        for (let j = i + 1; j < arr.length; j++) {
+          if (arr[i]["createTime"] == arr[j]["createTime"]) {
+            if (arr[i]["attendanceSummary"].indexOf("; ") == -1) {
+              arr[i]["attendanceSummary"] =
+                arr[i]["attendanceSummary"] + "; " + arr[j].attendanceSummary;
+            }
+          }
+        }
+      }
+
       let index = arr.findIndex((item) => item.createTime == currentTime);
       if (index > -1) {
         return arr[index].attendanceSummary ? (

attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue

@@ -201,10 +201,15 @@ export default {
           },
         ],
         columns: [
-          { type: "selection", width: 50 },
-          { type: "index", label: "序号", width: 50 },
+          { type: "selection", width: 50, fixed: "left" },
+          { type: "index", label: "序号", width: 50, fixed: "left" },
 
-          { label: "姓名", prop: "staffName", formatter: this.formatter },
+          {
+            label: "姓名",
+            prop: "staffName",
+            formatter: this.formatter,
+            fixed: "left",
+          },
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
@@ -221,20 +226,20 @@ export default {
           {
             label: "异常时间",
             prop: "errorTime",
-            width: 240,
+            width: 100,
             formatter: this.formatterDate,
           },
 
           {
             label: "上下班时间",
-            width: 100,
+            width: 110,
             prop: "goOffTimeStr",
           },
 
           {
             label: "实际打卡时间",
             prop: "actualAttendTime",
-            width: 240,
+            width: 100,
             formatter: this.formatterDate,
           },
 
@@ -274,7 +279,7 @@ export default {
           {
             label: "加分/扣分时间",
             prop: "deductTime",
-            width: 150,
+            width: 100,
             formatter: this.formatterDate,
           },
 
@@ -313,6 +318,7 @@ export default {
 
           {
             label: "操作",
+            width: 110,
             fixed: "right",
             formatter: (row) => {
               return row.checkStatus == 1 ? (

attendance-performance-manager-ui/admin/src/views/check/window/perform/list.vue

@@ -97,7 +97,7 @@ export default {
             fuzzy: false,
           },
           {
-            name: "createTimeMonth",
+            name: "yearmonth",
             type: "month",
             label: "请选择登记年月",
             fuzzy: false,

attendance-performance-manager-ui/admin/src/views/check/window/workman/perform/list.vue

@@ -98,7 +98,7 @@ export default {
             fuzzy: false,
           },
           {
-            name: "createTimeMonth",
+            name: "yearmonth",
             type: "month",
             label: "请选择登记年月",
             fuzzy: false,

attendance-performance-manager-ui/admin/src/views/staff/list.vue

@@ -293,10 +293,15 @@ export default {
     },
 
     handleNodeClick(node) {
-      delete this.$route.query.page;
       this.currentNode = node;
       this.query = Object.assign({}, this.query, { deptId: node.id });
       this.query.page = 1;
+      this.$router.push({
+        path: this.$route.path,
+        query: {
+          page: 1,
+        },
+      });
       this.getData();
     },
     doExport() {

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

@@ -20,6 +20,7 @@ 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.*;
+import com.mortals.xhx.module.dept.model.DeptEntity;
 import com.mortals.xhx.module.dept.model.DeptQuery;
 import com.mortals.xhx.module.dept.service.DeptService;
 import com.mortals.xhx.module.holiday.model.HolidayEntity;
@@ -75,6 +76,8 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
     @Autowired
     private ICacheService cacheService;
 
+    private AttendanceGroupStaffService attendanceGroupStaffService;
+
     @Override
     protected void findAfter(AttendanceStatEntity entity, Context context, List<AttendanceStatEntity> list) throws AppException {
         // DateUtil.parse(entity.getStartTime()).year();
@@ -610,12 +613,11 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
 
         int totalPersonNum = staffService.count(staffQuery, context);
         homeStatInfo.setTotalPersonNum(totalPersonNum);
-        staffQuery.setSource(1);
-
-
-        Integer totalAttendPersonNum = staffService.count(staffQuery, context);
+        //统计考勤组人数
+        Integer totalAttendPersonNum = attendanceGroupStaffService.count(new AttendanceGroupStaffQuery(), context);
 
-        int totalDeptNum = deptService.count(new DeptQuery(), context);
+        List<DeptEntity>  deptList = deptService.getDeptBySalaId(-1l);
+        int totalDeptNum = deptList.size();
         homeStatInfo.setTotalDeptNum(totalDeptNum);
 
         AttendanceRecordHikQuery hikQuery = new AttendanceRecordHikQuery();
@@ -680,8 +682,11 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
         AttendanceLeaveRecordQuery leaveRecordQuery = new AttendanceLeaveRecordQuery();
 /*        leaveRecordQuery.setCreateTimeStart(DateUtil.beginOfMonth(new Date()).toDateStr());
         leaveRecordQuery.setCreateTimeEnd(DateUtil.today());*/
-        leaveRecordQuery.setCreateTimeStart(DateUtil.yesterday().toDateStr());
-        leaveRecordQuery.setCreateTimeEnd(DateUtil.yesterday().toDateStr());
+//        leaveRecordQuery.setCreateTimeStart(DateUtil.yesterday().toDateStr());
+//        leaveRecordQuery.setCreateTimeEnd(DateUtil.yesterday().toDateStr());
+        //判断当前时间是否在请假开始结束时间范围内，StartTime<=当前日期 EndTime>=当前日期
+        leaveRecordQuery.setStartTimeEnd(DateUtil.yesterday().toDateStr());
+        leaveRecordQuery.setEndTimeStart(DateUtil.yesterday().toDateStr());
         leaveRecordQuery.setProcessStatus(ProcessStatusEnum.已处理.getValue());
         int levealPersonNum = leaveRecordService.count(leaveRecordQuery, context);
 

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

@@ -261,8 +261,11 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
                     BigDecimal erro = new BigDecimal(0);
                     erro = erro.add(staffPerformSummaryEntity.getReviewScore());
                     erro = erro.add(staffPerformSummaryEntity.getAttendScore());
-                    BigDecimal Score100 = new BigDecimal(100);
-                    erro = erro.add(Score100.subtract(staffPerformSummaryEntity.getOtherScore()));
+                    if(staffPerformSummaryEntity.getOtherScore().compareTo(BigDecimal.ZERO)!=0){
+                        BigDecimal Score100 = new BigDecimal(100);
+                        BigDecimal otherScoreErro = Score100.subtract(staffPerformSummaryEntity.getOtherScore());
+                        erro = erro.add(BigDecimal.ZERO.subtract(otherScoreErro));
+                    }
                     erro = erro.add(staffPerformSummaryEntity.getGoworkScore());
                     erro = erro.add(staffPerformSummaryEntity.getEffectScore());
                     erro = erro.add(staffPerformSummaryEntity.getComplainScore());

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

@@ -228,8 +228,11 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
                     BigDecimal erro = new BigDecimal(0);
                     erro = erro.add(staffPerformSummaryEntity.getReviewScore());
                     erro = erro.add(staffPerformSummaryEntity.getAttendScore());
-                    BigDecimal Score100 = new BigDecimal(100);
-                    erro = erro.add(Score100.subtract(staffPerformSummaryEntity.getOtherScore()));
+                    if(staffPerformSummaryEntity.getOtherScore().compareTo(BigDecimal.ZERO)!=0){
+                        BigDecimal Score100 = new BigDecimal(100);
+                        BigDecimal otherScoreErro = Score100.subtract(staffPerformSummaryEntity.getOtherScore());
+                        erro = erro.add(BigDecimal.ZERO.subtract(otherScoreErro));
+                    }
                     erro = erro.add(staffPerformSummaryEntity.getGoworkScore());
                     erro = erro.add(staffPerformSummaryEntity.getEffectScore());
                     erro = erro.add(staffPerformSummaryEntity.getComplainScore());

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

@@ -253,8 +253,11 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
                     BigDecimal erro = new BigDecimal(0);
                     erro = erro.add(staffPerformSummaryEntity.getReviewScore());
                     erro = erro.add(staffPerformSummaryEntity.getAttendScore());
-                    BigDecimal Score100 = new BigDecimal(100);
-                    erro = erro.add(Score100.subtract(staffPerformSummaryEntity.getOtherScore()));
+                    if(staffPerformSummaryEntity.getOtherScore().compareTo(BigDecimal.ZERO)!=0){
+                        BigDecimal Score100 = new BigDecimal(100);
+                        BigDecimal otherScoreErro = Score100.subtract(staffPerformSummaryEntity.getOtherScore());
+                        erro = erro.add(BigDecimal.ZERO.subtract(otherScoreErro));
+                    }
                     erro = erro.add(staffPerformSummaryEntity.getGoworkScore());
                     erro = erro.add(staffPerformSummaryEntity.getEffectScore());
                     erro = erro.add(staffPerformSummaryEntity.getComplainScore());

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

@@ -250,8 +250,11 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
                     BigDecimal erro = new BigDecimal(0);
                     erro = erro.add(staffPerformSummaryEntity.getReviewScore());
                     erro = erro.add(staffPerformSummaryEntity.getAttendScore());
-                    BigDecimal Score100 = new BigDecimal(100);
-                    erro = erro.add(Score100.subtract(staffPerformSummaryEntity.getOtherScore()));
+                    if(staffPerformSummaryEntity.getOtherScore().compareTo(BigDecimal.ZERO)!=0){
+                        BigDecimal Score100 = new BigDecimal(100);
+                        BigDecimal otherScoreErro = Score100.subtract(staffPerformSummaryEntity.getOtherScore());
+                        erro = erro.add(BigDecimal.ZERO.subtract(otherScoreErro));
+                    }
                     erro = erro.add(staffPerformSummaryEntity.getGoworkScore());
                     erro = erro.add(staffPerformSummaryEntity.getEffectScore());
                     erro = erro.add(staffPerformSummaryEntity.getComplainScore());

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

@@ -234,8 +234,7 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt
                     BigDecimal erro = new BigDecimal(0);
                     erro = erro.add(staffPerformSummaryEntity.getReviewScore());
                     erro = erro.add(staffPerformSummaryEntity.getAttendScore());
-                    BigDecimal Score100 = new BigDecimal(100);
-                    erro = erro.add(Score100.subtract(staffPerformSummaryEntity.getOtherScore()));
+                    erro = erro.add(staffPerformSummaryEntity.getOtherScore());
                     erro = erro.add(staffPerformSummaryEntity.getGoworkScore());
                     erro = erro.add(staffPerformSummaryEntity.getEffectScore());
                     erro = erro.add(staffPerformSummaryEntity.getComplainScore());

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

@@ -255,8 +255,11 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
                     BigDecimal erro = new BigDecimal(0);
                     erro = erro.add(staffPerformSummaryEntity.getReviewScore());
                     erro = erro.add(staffPerformSummaryEntity.getAttendScore());
-                    BigDecimal Score100 = new BigDecimal(100);
-                    erro = erro.add(Score100.subtract(staffPerformSummaryEntity.getOtherScore()));
+                    if(staffPerformSummaryEntity.getOtherScore().compareTo(BigDecimal.ZERO)!=0){
+                        BigDecimal Score100 = new BigDecimal(100);
+                        BigDecimal otherScoreErro = Score100.subtract(staffPerformSummaryEntity.getOtherScore());
+                        erro = erro.add(BigDecimal.ZERO.subtract(otherScoreErro));
+                    }
                     erro = erro.add(staffPerformSummaryEntity.getGoworkScore());
                     erro = erro.add(staffPerformSummaryEntity.getEffectScore());
                     erro = erro.add(staffPerformSummaryEntity.getComplainScore());

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

@@ -127,8 +127,11 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp
                     BigDecimal erro = new BigDecimal(0);
                     erro = erro.add(staffPerformSummaryEntity.getReviewScore());
                     erro = erro.add(staffPerformSummaryEntity.getAttendScore());
-                    BigDecimal Score100 = new BigDecimal(100);
-                    erro = erro.add(Score100.subtract(staffPerformSummaryEntity.getOtherScore()));
+                    if(staffPerformSummaryEntity.getOtherScore().compareTo(BigDecimal.ZERO)!=0){
+                        BigDecimal Score100 = new BigDecimal(100);
+                        BigDecimal otherScoreErro = Score100.subtract(staffPerformSummaryEntity.getOtherScore());
+                        erro = erro.add(BigDecimal.ZERO.subtract(otherScoreErro));
+                    }
                     erro = erro.add(staffPerformSummaryEntity.getGoworkScore());
                     erro = erro.add(staffPerformSummaryEntity.getEffectScore());
                     erro = erro.add(staffPerformSummaryEntity.getComplainScore());