Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager-ui/admin/src/views/perform/rules/attend/components/AttendIndex.vue

@@ -226,7 +226,9 @@ export default {
         type: this.activeName,
         page: this.query.page,
         orderColList: this.typeArr,
-        name: `%${this.searchValue}%`,
+        andConditionList: [
+          { content: `%${this.searchValue}%`, name: `%${this.searchValue}%` },
+        ],
       }).then((res) => {
         if (res.code == 1) {
           this.tableData = res.data;

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

@@ -92,7 +92,7 @@ export default {
           { label: "姓名", prop: "staffName" },
 
           { label: "工号", prop: "workNum" },
-          
+
           { label: "手机号", prop: "phoneNumber" },
 
           { label: "所属部门", prop: "deptName" },
@@ -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/daemon/task/SyncDoorsEventTaskImpl.java

 package com.mortals.xhx.daemon.task;
 
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.PageUtil;
 import cn.hutool.core.util.StrUtil;
@@ -66,7 +67,10 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
         userEntity.setCreateTime(new Date());
         context.setUser(userEntity);
         AttendanceRecordHikQuery recordHikEntity = new AttendanceRecordHikQuery();
-        recordHikEntity.setAttendanceDateStart(DateUtils.getCurrStrDate());
+
+       // Date todayStart = DateUtil.offsetHour(new Date(), -5).toJdkDate();
+      //  recordHikEntity.setAttendanceDateStart(DateUtils.getCurrStrDate());
+        recordHikEntity.setAttendanceDateStart(DateUtil.offsetHour(new Date(), -5).toString());
         recordHikEntity.setAttendanceDateEnd(DateUtils.getCurrStrDate());
         try {
             recordHikService.addAttendanceRecord(recordHikEntity, context);
@@ -87,7 +91,8 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
         eventTypes.add(196891);
         doorEventReq.setEventTypes(eventTypes);
         // 获取当天的开始时间
-        Date todayStart = DateUtil.beginOfDay(new Date());
+        Date todayStart = DateUtil.offsetHour(new Date(), -5).toJdkDate();
+       // Date todayStart = DateUtil.beginOfDay(new Date());
         // 获取当天的结束时间
         Date todayEnd = DateUtil.endOfDay(new Date());
         doorEventReq.setStartTime(todayStart);

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

@@ -74,7 +74,7 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
             for (PersonInfo personInfo : personInfoList) {
                 StaffEntity staffEntity = staffService.getExtCache(StrUtil.padPre(personInfo.getJobNo(), 8, "0"));
                 DeptEntity deptEntity = deptService.selectOne(new DeptQuery().deptCode(personInfo.getOrgIndexCode()));
-               // AttendanceVacationBalanceEntity balanceEntity = balanceService.selectOne(new AttendanceVacationBalanceQuery().staffId(staffEntity.getId()));
+                // AttendanceVacationBalanceEntity balanceEntity = balanceService.selectOne(new AttendanceVacationBalanceQuery().staffId(staffEntity.getId()));
                 //  AttendanceStatEntity statEntity = attendanceStatService.selectOne(new AttendanceStatQuery().staffId(staffEntity.getId()));
                 //判断本地数据是否为空
                 if (ObjectUtils.isEmpty(staffEntity)) {
@@ -106,7 +106,7 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
                     balanceEntity.setCreateUserId(1L);
                     balanceEntity.setCreateTime(new Date());
                     balanceService.save(balanceEntity);
-                   //AttendanceVacationBalanceEntity balanceEntity = balanceService.selectOne(new AttendanceVacationBalanceQuery().staffId(staffEntity.getId()));
+                    //AttendanceVacationBalanceEntity balanceEntity = balanceService.selectOne(new AttendanceVacationBalanceQuery().staffId(staffEntity.getId()));
 
                     AttendanceStatEntity attendanceStatEntity = new AttendanceStatEntity();
                     attendanceStatEntity.initAttrValue();
@@ -140,13 +140,18 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
                     attendanceStatEntity.setPersonalLeave(balanceEntity.getPersonalLeaveDays());
                     attendanceStatService.save(attendanceStatEntity);
                     //统计各级部门员工数量 todo  优化统计
-                    String ancestor = deptEntity.getAncestors().split(",", 2)[1];
-                    String[] ancestors = ancestor.split(",");
-                    for (String newAncestor : ancestors) {
-                        DeptEntity deptEntity2 = deptService.get(Long.valueOf(newAncestor));
-                        if (Objects.nonNull(deptEntity2)) {
-                            deptEntity2.setPersonNum(deptEntity2.getPersonNum() + 1);
-                            deptService.update(deptEntity2);
+                    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));
+                                if (Objects.nonNull(deptEntity2)) {
+                                    deptEntity2.setPersonNum(deptEntity2.getPersonNum() + 1);
+                                    deptService.update(deptEntity2);
+                                }
+                            }
                         }
                     }
                 } else {
@@ -166,13 +171,18 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
                     staffEntity.setUpdateTime(new Date());
                     staffService.update(staffEntity);
                     //统计各级部门员工数量
-                    String ancestor = deptEntity.getAncestors().split(",", 2)[1];
-                    String[] ancestors = ancestor.split(",");
-                    for (String newAncestor : ancestors) {
-                        DeptEntity deptEntity2 = deptService.get(Long.valueOf(newAncestor));
-                        if (Objects.nonNull(deptEntity2)) {
-                            deptEntity2.setPersonNum(deptEntity2.getPersonNum() + 1);
-                            deptService.update(deptEntity2);
+                    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));
+                                if (Objects.nonNull(deptEntity2)) {
+                                    deptEntity2.setPersonNum(deptEntity2.getPersonNum() + 1);
+                                    deptService.update(deptEntity2);
+                                }
+                            }
                         }
                     }
                 }
@@ -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

@@ -22,6 +22,8 @@ import org.apache.poi.ss.formula.functions.T;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
+import java.util.HashMap;
+
 
 @Service("dingPersonService")
 @Slf4j
@@ -120,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);
     }
 
@@ -130,20 +132,19 @@ 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();
-
-            getProcessInstanceHeaders.getCommonHeaders().put("host","172.15.28.113");
-            getProcessInstanceHeaders.getCommonHeaders().put("port","8918");
-            getProcessInstanceHeaders.getCommonHeaders().put("protocol","http");
+/*            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");*/
 
             com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceRequest getProcessInstanceRequest = new com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceRequest()
                     .setProcessInstanceId(processInstanceId);
-
-
-
+            log.info("processInstanceId:{}", processInstanceId);
             GetProcessInstanceResponse rsp = client.getProcessInstanceWithOptions(getProcessInstanceRequest, getProcessInstanceHeaders, new com.aliyun.teautil.models.RuntimeOptions());
             return Rest.ok("成功", rsp.getBody().getResult());
         } catch (Exception e) {
-            log.info("根据用户查询审批详情失败", e);
+            log.error("根据用户查询审批详情失败", e);
             return Rest.fail(e.getMessage());
 
         }