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

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

+package com.mortals.xhx.daemon.task;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.PageUtil;
+import cn.hutool.core.util.StrUtil;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.service.ITask;
+import com.mortals.framework.service.ITaskExcuteService;
+import com.mortals.framework.util.DateUtils;
+import com.mortals.xhx.base.system.user.model.UserEntity;
+import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.module.attendance.model.AttendanceRecordHikEntity;
+import com.mortals.xhx.module.attendance.model.AttendanceRecordHikQuery;
+import com.mortals.xhx.module.attendance.service.AttendanceRecordHikService;
+import com.mortals.xhx.module.hik.door.model.req.door.DoorEventReq;
+import com.mortals.xhx.module.hik.door.model.rsp.door.DoorEventDataInfo;
+import com.mortals.xhx.module.hik.door.service.IHikDoorService;
+import com.mortals.xhx.module.staff.model.StaffEntity;
+import com.mortals.xhx.module.staff.service.StaffService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * 同步获取下午海康门禁事件
+ */
+@Slf4j
+@Service("SyncDoorsEventAfterTask")
+public class SyncDoorsEventAfterTaskImpl implements ITaskExcuteService {
+
+    @Autowired
+    private AttendanceRecordHikService recordHikService;
+
+    @Autowired
+    private StaffService staffService;
+
+    @Autowired
+    private IHikDoorService hikDoorService;
+
+
+    @Override
+    public void excuteTask(ITask task) throws AppException {
+        syncDoorEvents();
+
+        calculateAttendByDay();
+    }
+
+    private void calculateAttendByDay() {
+        Context context = new Context();
+        UserEntity userEntity = new UserEntity();
+        userEntity.setCreateUserId(1L);
+        userEntity.setCreateUserName("system");
+        userEntity.setCreateTime(new Date());
+        context.setUser(userEntity);
+        AttendanceRecordHikQuery recordHikEntity = new AttendanceRecordHikQuery();
+
+        // 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.addAttendanceRecordByQuery(recordHikEntity, context);
+        } catch (Exception e) {
+            log.error("计算考勤异常", e);
+        }
+    }
+
+    private void syncDoorEvents() {
+        DoorEventReq doorEventReq = new DoorEventReq();
+        List<Integer> eventTypes = new ArrayList<>();
+        eventTypes.add(196885);
+        eventTypes.add(196887);
+        eventTypes.add(196893);
+        eventTypes.add(196888);
+        eventTypes.add(196889);
+        eventTypes.add(196890);
+        eventTypes.add(196891);
+        doorEventReq.setEventTypes(eventTypes);
+        // 获取当天的开始时间
+        Date todayStart = DateUtil.offsetHour(new Date(), -5).toJdkDate();
+        // Date todayStart = DateUtil.beginOfDay(new Date());
+        // 获取当天的结束时间
+        Date todayEnd = DateUtil.endOfDay(new Date());
+        doorEventReq.setStartTime(todayStart);
+        doorEventReq.setEndTime(todayEnd);
+        doorEventReq.setPageNo(1);
+        doorEventReq.setPageSize(1);
+
+        Rest<DoorEventDataInfo> doorEventsRest = hikDoorService.getDoorEvents(doorEventReq);
+        log.info("doorEventsRest:{} msg:{}", doorEventsRest.getCode(), doorEventsRest.getMsg());
+        if (doorEventsRest.getCode() == YesNoEnum.YES.getValue()) {
+            //分页获取考勤数据
+            Integer total = doorEventsRest.getData().getTotal();
+            int pageCount = PageUtil.totalPage(total, 1000);
+            for (int i = 1; i <= pageCount; i++) {
+                doorEventReq.setPageNo(i);
+                doorEventReq.setPageSize(1000);
+                doorEventsRest = hikDoorService.getDoorEvents(doorEventReq);
+                log.info("doorEventsRest:{} msg:{},page:{}", doorEventsRest.getCode(), doorEventsRest.getMsg(), doorEventReq.getPageNo());
+                getDoorEvents(doorEventsRest);
+            }
+        }
+    }
+
+    private void getDoorEvents(Rest<DoorEventDataInfo> doorEventsRest) {
+        //同步当前考勤数据
+        List<AttendanceRecordHikEntity> attRecords = doorEventsRest.getData().getList().stream().map(item -> {
+            AttendanceRecordHikEntity recordHikEntity = new AttendanceRecordHikEntity();
+            recordHikEntity.initAttrValue();
+            StaffEntity staffCache = staffService.getExtCache(StrUtil.padPre(item.getJobNo(), 8, "0"));
+            if (ObjectUtils.isEmpty(staffCache)) {
+                log.info("staff is null !staffCode:{}", item.getJobNo());
+                return null;
+            }
+
+            recordHikEntity.setStaffId(staffCache.getId());
+            recordHikEntity.setStaffName(staffCache.getName());
+            recordHikEntity.setWorkNum(staffCache.getWorkNum());
+            recordHikEntity.setDeptId(staffCache.getDeptId());
+            recordHikEntity.setDeptName(staffCache.getDeptName());
+            recordHikEntity.setPositionId(staffCache.getPositionId());
+            recordHikEntity.setPositionName(staffCache.getPositionName());
+
+            recordHikEntity.setAttendanceDate(item.getEventTime());
+            recordHikEntity.setAttendanceAddress(item.getDoorName());
+            recordHikEntity.setEventSource("门禁点");
+            recordHikEntity.setRemark(item.getEventId());
+            recordHikEntity.setCreateTime(new Date());
+            recordHikEntity.setCreateUserName("系统管理员");
+            recordHikEntity.setCreateUserId(1L);
+            return recordHikEntity;
+        }).filter(f -> f != null).collect(Collectors.toList());
+        log.info("attRecords size:{}", attRecords.size());
+        List<String> eventIds = attRecords.parallelStream().filter(f -> !ObjectUtils.isEmpty(f) && !ObjectUtils.isEmpty(f.getRemark())).map(i -> i.getRemark()).collect(Collectors.toList());
+
+        //查询当天考勤记录是否有重复的 有的 则不添加
+        AttendanceRecordHikQuery recordHikQuery = new AttendanceRecordHikQuery();
+        recordHikQuery.setAttendanceDateStart(DateUtil.format(DateUtil.beginOfDay(new Date()), "yyyy-MM-dd"));
+        recordHikQuery.setAttendanceDateEnd(DateUtil.format(DateUtil.beginOfDay(new Date()), "yyyy-MM-dd"));
+        recordHikQuery.setRemarkList(eventIds);
+        Set<String> eventIdSet = recordHikService.find(recordHikQuery).parallelStream().map(i -> i.getRemark()).collect(Collectors.toSet());
+
+        //去重 时分秒打卡的 也要去掉重复。
+        List<AttendanceRecordHikEntity> saveRecordList = attRecords.stream().filter(f -> !eventIdSet.contains(f.getRemark())).collect(Collectors.toList());
+        if (!ObjectUtils.isEmpty(saveRecordList)) {
+            //单个插入 去掉重复时间段的打卡记录
+            for (AttendanceRecordHikEntity recordHikEntity : saveRecordList) {
+                try {
+                    recordHikService.save(recordHikEntity);
+                } catch (Exception e) {
+                    log.error("基础考勤数据保存异常", e.getMessage());
+                }
+            }
+            // recordHikService.save(saveRecordList);
+        }
+        log.info("saveRecordList size:{}", saveRecordList.size());
+    }
+
+
+    @Override
+    public void stopTask(ITask task) throws AppException {
+
+    }
+}

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;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
@@ -23,12 +20,10 @@ import com.mortals.xhx.module.hik.door.service.IHikDoorService;
 import com.mortals.xhx.module.staff.model.StaffEntity;
 import com.mortals.xhx.module.staff.service.StaffService;
 import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
-import java.time.Year;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -73,7 +68,7 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
         recordHikEntity.setAttendanceDateStart(DateUtil.offsetHour(new Date(), -5).toString());
         recordHikEntity.setAttendanceDateEnd(DateUtils.getCurrStrDate());
         try {
-            recordHikService.addAttendanceRecord(recordHikEntity, context);
+            recordHikService.addAttendanceRecordByQuery(recordHikEntity, context);
         } catch (Exception e) {
             log.error("计算考勤异常", e);
         }
@@ -123,7 +118,7 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
             recordHikEntity.initAttrValue();
             StaffEntity staffCache = staffService.getExtCache(StrUtil.padPre(item.getJobNo(), 8, "0"));
             if (ObjectUtils.isEmpty(staffCache)) {
-                log.info("staff is null !staffCode:{}",item.getJobNo());
+                log.info("staff is null !staffCode:{}", item.getJobNo());
                 return null;
             }
 
@@ -140,13 +135,11 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
             recordHikEntity.setEventSource("门禁点");
             recordHikEntity.setRemark(item.getEventId());
             recordHikEntity.setCreateTime(new Date());
-            recordHikEntity.setCreateUserName("system");
+            recordHikEntity.setCreateUserName("系统管理员");
             recordHikEntity.setCreateUserId(1L);
             return recordHikEntity;
-        }).filter(f->f!=null).collect(Collectors.toList());
-
+        }).filter(f -> f != null).collect(Collectors.toList());
         log.info("attRecords size:{}", attRecords.size());
-
         List<String> eventIds = attRecords.parallelStream().filter(f -> !ObjectUtils.isEmpty(f) && !ObjectUtils.isEmpty(f.getRemark())).map(i -> i.getRemark()).collect(Collectors.toList());
 
         //查询当天考勤记录是否有重复的 有的 则不添加
@@ -156,9 +149,18 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
         recordHikQuery.setRemarkList(eventIds);
         Set<String> eventIdSet = recordHikService.find(recordHikQuery).parallelStream().map(i -> i.getRemark()).collect(Collectors.toSet());
 
+        //去重 时分秒打卡的 也要去掉重复。
         List<AttendanceRecordHikEntity> saveRecordList = attRecords.stream().filter(f -> !eventIdSet.contains(f.getRemark())).collect(Collectors.toList());
         if (!ObjectUtils.isEmpty(saveRecordList)) {
-            recordHikService.save(saveRecordList);
+            //单个插入 去掉重复时间段的打卡记录
+            for (AttendanceRecordHikEntity recordHikEntity : saveRecordList) {
+                try {
+                    recordHikService.save(recordHikEntity);
+                } catch (Exception e) {
+                    log.error("基础考勤数据保存异常", e.getMessage());
+                }
+            }
+            // recordHikService.save(saveRecordList);
         }
         log.info("saveRecordList size:{}", saveRecordList.size());
     }
@@ -168,20 +170,4 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
     public void stopTask(ITask task) throws AppException {
 
     }
-
-    public static void main(String[] args) {
-        // 获取当前时间的小时数
-        int hour = DateUtil.hour(new Date(), true);
-        // 获取当前时间所在小时的开始时间和结束时间
-        Date startTime = DateUtil.beginOfHour(new Date());
-        Date endTime = DateUtil.endOfHour(new Date());
-
-        // 格式化时间为指定格式
-        String startTimeStr = DateUtil.format(startTime, "yyyy-MM-dd HH:00:00");
-        String endTimeStr = DateUtil.format(endTime, "yyyy-MM-dd HH:59:59");
-
-        // 输出结果
-        System.out.println("当前时间所在小时的开始时间：" + startTimeStr);
-        System.out.println("当前时间所在小时的结束时间：" + endTimeStr);
-    }
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dingmsg/api/DingMessageController.java

@@ -20,6 +20,9 @@ import com.mortals.xhx.module.attendance.model.AttendanceLeaveRecordEntity;
 import com.mortals.xhx.module.attendance.model.AttendanceLeaveRecordQuery;
 import com.mortals.xhx.module.attendance.service.AttendanceLeaveRecordService;
 import com.mortals.xhx.module.dingding.personal.service.IDingPersonService;
+import com.mortals.xhx.module.staff.model.StaffEntity;
+import com.mortals.xhx.module.staff.model.StaffQuery;
+import com.mortals.xhx.module.staff.service.StaffService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.logging.Log;
 import org.apache.poi.ss.formula.functions.T;
@@ -54,7 +57,8 @@ public class DingMessageController {
     private IDingPersonService dingPersonService;
     @Autowired
     private AttendanceLeaveRecordService attendanceLeaveRecordService;
-
+    @Autowired
+    private StaffService staffService;
 
     /**
      * appKey
@@ -109,15 +113,22 @@ public class DingMessageController {
                         AttendanceLeaveRecordEntity leaveRecordEntity = new AttendanceLeaveRecordEntity();
                         leaveRecordEntity.initAttrValue();
                         leaveRecordEntity.setRemark(processInstanceId);   //将钉钉的事物id作为备注填入数据库
-                        leaveRecordEntity.setLeavePersonId(Long.parseLong(result.getOriginatorUserId()));
-                        leaveRecordEntity.setLeavePerson(result.getTitle().substring(0,result.getTitle().indexOf("提交")));
-                        leaveRecordEntity.setDeptId(Long.parseLong(result.getOriginatorDeptId()));
-                        leaveRecordEntity.setDeptName(result.getOriginatorDeptName());
 
+                        Rest<String> mobileRest = dingPersonService.getPersonById(result.getOriginatorUserId());
+                        if(mobileRest.getCode() == Rest.SUCCESS) {
+                            String mobile = mobileRest.getData();
+                            StaffEntity staffEntity = staffService.selectOne(new StaffQuery().phoneNumber(mobile));
+                            if(!ObjectUtils.isEmpty(staffEntity)){
 
+                                leaveRecordEntity.setLeavePersonId(staffEntity.getId());
+                                leaveRecordEntity.setLeavePerson(staffEntity.getName());
+                                leaveRecordEntity.setDeptId(staffEntity.getDeptId());
+                                leaveRecordEntity.setDeptName(staffEntity.getDeptName());
+                                leaveRecordEntity.setPhoneNumber(staffEntity.getPhoneNumber());
 
                                 if(result.getTasks().size() >0 ){
                                     Date startTime = dateFormat(result.getTasks().get(0).getCreateTime());
+
                                     Date endTime = dateFormat(result.getTasks().get(0).getFinishTime());
                                     leaveRecordEntity.setStartTime(startTime);
                                     leaveRecordEntity.setEndTime(endTime);
@@ -252,6 +263,20 @@ public class DingMessageController {
                                 }
 
 
+
+                            }else {
+                                log.info("该号码("+mobile +")未在本系统绑定");
+                            }
+
+
+                        }else {
+                            log.info("根据id在钉钉平台查询电话失败"+mobileRest.getMsg());
+                        }
+
+
+
+
+
                     }
 
                 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceStatEntity.java

 package com.mortals.xhx.module.attendance.model;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.ArrayList;
+
+import cn.hutool.core.date.DateUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
@@ -29,6 +32,7 @@ public class AttendanceStatEntity extends AttendanceStatVo {
     /**
      * 员工姓名
      */
+    @Excel(name = "员工姓名")
     private String staffName;
     /**
      * 所属部门
@@ -37,6 +41,7 @@ public class AttendanceStatEntity extends AttendanceStatVo {
     /**
      * 所属部门名称
      */
+    @Excel(name = "部门名称")
     private String deptName;
     /**
      * 回单位（天）
@@ -312,11 +317,11 @@ public class AttendanceStatEntity extends AttendanceStatVo {
 
         this.earlyLeaveMeeting = BigDecimal.valueOf(0);
 
-        this.year = -1;
+        this.year = DateUtil.year(new Date());
 
-        this.month = -1;
+        this.month = DateUtil.month(new Date())+1;
 
-        this.day = -1;
+        this.day = DateUtil.dayOfMonth(new Date());
 
         this.remark = "";
 
@@ -338,4 +343,8 @@ public class AttendanceStatEntity extends AttendanceStatVo {
 
         this.afternoonTimes = 0;
     }
+
+    public static void main(String[] args) {
+        System.out.println(DateUtil.dayOfMonth(new Date()));
+    }
 }
\ No newline at end of file

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

@@ -4,6 +4,8 @@ import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.attendance.dao.AttendanceRecordHikDao;
 import com.mortals.xhx.module.attendance.model.AttendanceRecordHikEntity;
 
+import java.util.List;
+
 /**
 * AttendanceRecordHikService
 *
@@ -17,9 +19,26 @@ public interface AttendanceRecordHikService extends ICRUDService<AttendanceRecor
     AttendanceRecordHikDao getDao();
 
     /**
-     * 将原始数据导入打卡记录表
-     * @param entity
+     * 根据查询条件生成打卡记录
+     * @param attendanceRecordHikQuery
+     */
+     void addAttendanceRecordByQuery(AttendanceRecordHikEntity attendanceRecordHikQuery, Context context) throws Exception;
+
+
+
+    /**
+     * 根据查询条件生成打卡记录
+     * @param hikEntity
      */
-     void addAttendanceRecord(AttendanceRecordHikEntity entity, Context context) throws Exception;
+    void addAttendanceRecord(AttendanceRecordHikEntity hikEntity, Context context) throws Exception;
+
+
+
+    /**
+     * 根据查原始记录列表生成打卡记录
+     * @param hikEntityList
+     */
+    void addAttendanceRecordList(List<AttendanceRecordHikEntity> hikEntityList, Context context) throws Exception;
+
 
 }

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

@@ -127,7 +127,7 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
             if (ObjectUtils.isEmpty(hikEntity.getAttendanceDateStart())) {
                 throw new AppException("请选择开始日期");
             }
-            hikService.addAttendanceRecord(hikEntity, getContext());
+            hikService.addAttendanceRecordByQuery(hikEntity, getContext());
             model.put("message_info", busiDesc + "成功");
             this.recordSysLog(this.request, busiDesc + " 【成功】");
         } catch (Exception e) {

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

@@ -5,11 +5,14 @@ import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.AllHolidaysEnum;
 import com.mortals.xhx.module.attendance.model.AttendanceVacationBalanceEntity;
 import com.mortals.xhx.module.attendance.service.AttendanceVacationBalanceService;
+import com.mortals.xhx.module.dept.model.DeptQuery;
+import com.mortals.xhx.module.dept.service.DeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
 *
@@ -25,6 +28,9 @@ public class AttendanceVacationBalanceController extends BaseCRUDJsonBodyMapping
     @Autowired
     private ParamService paramService;
 
+    @Autowired
+    private DeptService deptService;
+
 
     public AttendanceVacationBalanceController(){
         super.setModuleDesc( "员工假期余额信息");
@@ -33,6 +39,7 @@ public class AttendanceVacationBalanceController extends BaseCRUDJsonBodyMapping
     @Override
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model,"AllHolidays",AllHolidaysEnum.getEnumMap());
+        this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName())));
         super.init(model, context);
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/model/DeptPerformStatEntity.java

 package com.mortals.xhx.module.dept.model;
 import java.math.BigDecimal;
-import java.util.List;
-import java.util.ArrayList;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.annotation.Excel;
-import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.dept.model.vo.DeptPerformStatVo;
 import lombok.Data;
 /**
-* 部门绩效分数统计实体对象
-*
-* @author zxfei
-* @date 2023-07-14
-*/
+ * 部门绩效分数统计实体对象
+ *
+ * @author zxfei
+ * @date 2023-07-20
+ */
 @Data
 public class DeptPerformStatEntity extends DeptPerformStatVo {
     private static final long serialVersionUID = 1L;
@@ -165,10 +163,10 @@ public class DeptPerformStatEntity extends DeptPerformStatVo {
 
         this.remark = "";
 
-            this.year = -1;
+        this.year = DateUtil.year(new Date());
 
-            this.month = -1;
+        this.month = DateUtil.month(new Date())+1;
 
-            this.day = -1;
+        this.day = DateUtil.dayOfMonth(new Date());
     }
 }
\ No newline at end of file

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

@@ -2,6 +2,7 @@ package com.mortals.xhx.module.dingding.personal.service;
 
 
 import com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceResponseBody;
+import com.dingtalk.api.response.OapiV2UserGetResponse;
 import com.mortals.framework.common.Rest;
 import com.mortals.xhx.module.dingding.IDingTalkService;
 import com.mortals.xhx.module.dingding.personal.model.req.workmsg.WorkMsgReq;
@@ -27,6 +28,14 @@ public interface IDingPersonService extends IDingTalkService {
      */
     Rest<String> getPersonByMobile(String mobile);
 
+    /**
+     * 根据id获取用户电话
+     *
+     * @param id
+     * @return
+             */
+    Rest<String> getPersonById(String id);
+
     /**
      * 根据code获取钉钉用户id
      *

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

@@ -6,9 +6,11 @@ import com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceResponseBody;
 import com.aliyun.tea.TeaException;
 import com.dingtalk.api.DingTalkClient;
 import com.dingtalk.api.request.OapiMessageCorpconversationAsyncsendV2Request;
+import com.dingtalk.api.request.OapiV2UserGetRequest;
 import com.dingtalk.api.request.OapiV2UserGetbymobileRequest;
 import com.dingtalk.api.request.OapiV2UserGetuserinfoRequest;
 import com.dingtalk.api.response.OapiMessageCorpconversationAsyncsendV2Response;
+import com.dingtalk.api.response.OapiV2UserGetResponse;
 import com.dingtalk.api.response.OapiV2UserGetbymobileResponse;
 import com.dingtalk.api.response.OapiV2UserGetuserinfoResponse;
 import com.mortals.framework.common.Rest;
@@ -50,6 +52,26 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
         }
     }
 
+    @Override
+    public Rest<String> getPersonById(String id) {
+        try {
+            DingTalkClient client = getDingTalkClient("/topapi/v2/user/get");
+            OapiV2UserGetRequest req = new OapiV2UserGetRequest();
+            req.setUserid(id);   //用户id
+            log.info("getPersonByID:{}",id);
+            OapiV2UserGetResponse rsp = client.execute(req, getToken());
+            log.info("钉钉返回用户信息:{}", rsp.getBody());
+            if (rsp.getErrcode() == 0) {
+                return Rest.ok("成功", rsp.getResult().getMobile());
+            } else {
+                return Rest.fail(String.format("code:%s,msg:%s", rsp.getErrcode(), rsp.getErrmsg()));
+            }
+        } catch (ApiException e) {
+            log.info("根据手机号码查询人员异常", e);
+            return Rest.fail(e.getMessage());
+        }
+    }
+
     @Override
     public Rest<String> getPersonByCode(String code) {
         try {

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

@@ -12,6 +12,8 @@ import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.code.*;
+import com.mortals.xhx.module.dept.model.DeptQuery;
+import com.mortals.xhx.module.dept.service.DeptService;
 import com.mortals.xhx.module.perform.model.PerformRulesQuery;
 import com.mortals.xhx.module.perform.model.vo.AppealInfo;
 import com.mortals.xhx.module.perform.model.vo.AppealSummaryQuery;
@@ -65,6 +67,8 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
     private UserService userService;
     @Autowired
     private PerformRulesService rulesService;
+    @Autowired
+    private DeptService deptService;
 
 
     public PerformAttendAppealController() {
@@ -84,8 +88,9 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
         this.addDict(model, "reviewResult", paramService.getParamBySecondOrganize("PerformAttendAppeal", "reviewResult"));
         this.addDict(model, "reviewSource", paramService.getParamBySecondOrganize("PerformAttendAppeal", "reviewSource"));
         this.addDict(model, "irregularType", IrregularTypeEnum.getEnumMap());
-
         this.addDict(model, "irregularOtherType", IrregularOtherTypeEnum.getEnumMap());
+        this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName())));
+
         super.init(model, context);
     }