修改考勤汇总

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

@@ -103,15 +103,16 @@ export default {
             },
           },
 
-          { label: "考勤绩效", prop: "attendScore", formatter: this.formatter },
+          { label: "考勤绩效指标分数", prop: "attendScore", formatter: this.formatter },
 
-          { label: "评价绩效", prop: "assessScore", formatter: this.formatter },
+          { label: "评价绩效指标分数", prop: "reviewScore", formatter: this.formatter },
+          { label: "投诉绩效指标分数", prop: "reviewScore", formatter: this.formatter },
 
-          { label: "办件绩效", prop: "workScore", formatter: this.formatter },
+          { label: "办件绩效分数", prop: "workScore", formatter: this.formatter },
 
-          { label: "效能绩效", prop: "effectScore", formatter: this.formatter },
+          { label: "效能绩效分数", prop: "effectScore", formatter: this.formatter },
 
-          { label: "其它绩效", prop: "otherScore", formatter: this.formatter },
+          { label: "其它绩效分数", prop: "otherScore", formatter: this.formatter },
 
           {
             label: "累计异常分数",

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/MockDataController.java

@@ -199,13 +199,13 @@ public class MockDataController {
                 statEntity.setWorkNum(item.getWorkNum());
                 statEntity.setDeptId(item.getDeptId());
                 statEntity.setDeptName(item.getDeptName());
-                BigDecimal attendScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2, BigDecimal.ROUND_CEILING);
-                BigDecimal reviewScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2, BigDecimal.ROUND_CEILING);
-                BigDecimal complainScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2, BigDecimal.ROUND_CEILING);
-                BigDecimal goworkScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2, BigDecimal.ROUND_CEILING);
-                BigDecimal effectScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2, BigDecimal.ROUND_CEILING);
-                BigDecimal otherScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2, BigDecimal.ROUND_CEILING);
-                BigDecimal errorScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("1")).setScale(2, BigDecimal.ROUND_CEILING);
+                BigDecimal attendScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal(100)).setScale(1, BigDecimal.ROUND_CEILING);
+                BigDecimal reviewScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal(100)).setScale(1, BigDecimal.ROUND_CEILING);
+                BigDecimal complainScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal(100)).setScale(1, BigDecimal.ROUND_CEILING);
+                BigDecimal goworkScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal(100)).setScale(1, BigDecimal.ROUND_CEILING);
+                BigDecimal effectScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal(100)).setScale(1, BigDecimal.ROUND_CEILING);
+                BigDecimal otherScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal(100)).setScale(1, BigDecimal.ROUND_CEILING);
+                BigDecimal errorScore = RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal(100)).setScale(1, BigDecimal.ROUND_CEILING);
 
                 BigDecimal totalScore = attendScore.add(reviewScore).add(complainScore).add(goworkScore).add(effectScore).add(otherScore).add(errorScore);
 

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java

@@ -140,7 +140,10 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
                     attendanceStatEntity.setPersonalLeave(balanceEntity.getPersonalLeaveDays());
                     attendanceStatService.save(attendanceStatEntity);
                     //统计各级部门员工数量 todo  优化统计
-                    String ancestor = deptEntity.getAncestors().split(",", 2)[1];
+                    if (!ObjectUtils.isEmpty(deptEntity.getAncestors())) {
+                        String[] split = deptEntity.getAncestors().split(",", 2);
+                        if (split.length > 1) {
+                            String ancestor = split[1];
                             String[] ancestors = ancestor.split(",");
                             for (String newAncestor : ancestors) {
                                 DeptEntity deptEntity2 = deptService.get(Long.valueOf(newAncestor));
@@ -149,6 +152,8 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
                                     deptService.update(deptEntity2);
                                 }
                             }
+                        }
+                    }
                 } else {
                     //更新
                     if (!ObjectUtils.isEmpty(deptEntity)) {
@@ -166,7 +171,10 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
                     staffEntity.setUpdateTime(new Date());
                     staffService.update(staffEntity);
                     //统计各级部门员工数量
-                    String ancestor = deptEntity.getAncestors().split(",", 2)[1];
+                    if (!ObjectUtils.isEmpty(deptEntity.getAncestors())) {
+                        String[] split = deptEntity.getAncestors().split(",", 2);
+                        if(split.length>1){
+                            String ancestor = split[1];
                             String[] ancestors = ancestor.split(",");
                             for (String newAncestor : ancestors) {
                                 DeptEntity deptEntity2 = deptService.get(Long.valueOf(newAncestor));
@@ -179,6 +187,8 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
                     }
                 }
             }
+        }
+    }
 
     private void syncDepts() {
         //部门同步
@@ -220,6 +230,7 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
             }
         }
     }
+
     @Override
     public void stopTask(ITask task) throws AppException {
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dingding/personal/service/impl/DingPersonServiceImpl.java

@@ -122,7 +122,7 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
         com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config();
         config.protocol = "https";
         config.regionId = "central";
-        config.endpoint = domain.replace("http://", "");
+       // config.endpoint = domain.replace("http://", "");
         return new com.aliyun.dingtalkworkflow_1_0.Client(config);
     }
 
@@ -132,11 +132,11 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
             com.aliyun.dingtalkworkflow_1_0.Client client = createClient();
             com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceHeaders getProcessInstanceHeaders = new com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceHeaders();
             getProcessInstanceHeaders.xAcsDingtalkAccessToken = getToken();
-            HashMap<String, String> map = new HashMap<>();
+/*            HashMap<String, String> map = new HashMap<>();
             getProcessInstanceHeaders.setCommonHeaders(map);
             getProcessInstanceHeaders.getCommonHeaders().put("host", "172.15.28.113");
             getProcessInstanceHeaders.getCommonHeaders().put("port", "8918");
-            getProcessInstanceHeaders.getCommonHeaders().put("protocol", "http");
+            getProcessInstanceHeaders.getCommonHeaders().put("protocol", "http");*/
 
             com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceRequest getProcessInstanceRequest = new com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceRequest()
                     .setProcessInstanceId(processInstanceId);