Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/AttendanceLeaveRecordDao.java

@@ -2,6 +2,8 @@ package com.mortals.xhx.module.attendance.dao;
 
 import com.mortals.framework.dao.ICRUDDao;
 import com.mortals.xhx.module.attendance.model.AttendanceLeaveRecordEntity;
+import com.mortals.xhx.module.attendance.model.AttendanceLeaveRecordQuery;
+
 import java.util.List;
 /**
 * 请假记录信息Dao
@@ -12,6 +14,5 @@ import java.util.List;
 */
 
 public interface  AttendanceLeaveRecordDao extends ICRUDDao<AttendanceLeaveRecordEntity,Long>{
-
-
+    AttendanceLeaveRecordEntity doUpdateRecord(String processInstanceId,AttendanceLeaveRecordEntity leaveRecordEntity);
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/ibatis/AttendanceLeaveRecordDaoImpl.java

 package com.mortals.xhx.module.attendance.dao.ibatis;
 
 
+import com.mortals.framework.exception.AppException;
+import com.mortals.xhx.module.attendance.model.AttendanceLeaveRecordQuery;
+import com.mortals.xhx.module.attendance.service.AttendanceLeaveRecordService;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.stereotype.Repository;
 import com.mortals.xhx.module.attendance.dao.AttendanceLeaveRecordDao;
 import com.mortals.xhx.module.attendance.model.AttendanceLeaveRecordEntity;
@@ -16,6 +20,24 @@ import java.util.List;
 @Repository("attendanceLeaveRecordDao")
 public class AttendanceLeaveRecordDaoImpl extends BaseCRUDDaoMybatis<AttendanceLeaveRecordEntity,Long> implements AttendanceLeaveRecordDao {
 
+    AttendanceLeaveRecordService attendanceLeaveRecordService;
 
+    @Override
+    public AttendanceLeaveRecordEntity doUpdateRecord(String processInstanceId,AttendanceLeaveRecordEntity leaveRecordEntity) {
+        AttendanceLeaveRecordEntity recordEntity = attendanceLeaveRecordService.selectOne(new AttendanceLeaveRecordQuery().remark(processInstanceId));
+        if(ObjectUtils.isEmpty(recordEntity)){
+            leaveRecordEntity.setCreateTime(new Date());
+            leaveRecordEntity.setCreateUserId(1L);
+            attendanceLeaveRecordService.save(leaveRecordEntity);
+        }else{
+            leaveRecordEntity.setId(recordEntity.getId());
 
+            leaveRecordEntity.setUpdateUserId(1L);
+            leaveRecordEntity.setUpdateTime(new Date());
+
+            attendanceLeaveRecordService.update(leaveRecordEntity);
+        }
+
+        return leaveRecordEntity;
+    }
 }

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

@@ -323,20 +323,22 @@ public class DingMessageController {
                                         leaveRecordEntity.setReason(result.getOperationRecords().get(0).getRemark());
                                     }
                                     //更新请假记录表
-                                    AttendanceLeaveRecordEntity recordEntity = attendanceLeaveRecordService.selectOne(new AttendanceLeaveRecordQuery().remark(processInstanceId));
-                                    if(ObjectUtils.isEmpty(recordEntity)){
-
-                                        leaveRecordEntity.setCreateTime(new Date());
-                                        leaveRecordEntity.setCreateUserId(1L);
-                                        attendanceLeaveRecordService.save(leaveRecordEntity);
-                                    }else{
-                                        leaveRecordEntity.setId(recordEntity.getId());
-
-                                        leaveRecordEntity.setUpdateUserId(1L);
-                                        leaveRecordEntity.setUpdateTime(new Date());
+//                                    AttendanceLeaveRecordEntity recordEntity = attendanceLeaveRecordService.selectOne(new AttendanceLeaveRecordQuery().remark(processInstanceId));
+//                                    if(ObjectUtils.isEmpty(recordEntity)){
+//
+//                                        leaveRecordEntity.setCreateTime(new Date());
+//                                        leaveRecordEntity.setCreateUserId(1L);
+//                                        attendanceLeaveRecordService.save(leaveRecordEntity);
+//                                    }else{
+//                                        leaveRecordEntity.setId(recordEntity.getId());
+//
+//                                        leaveRecordEntity.setUpdateUserId(1L);
+//                                        leaveRecordEntity.setUpdateTime(new Date());
+//
+//                                        attendanceLeaveRecordService.update(leaveRecordEntity);
+//                                    }
 
-                                        attendanceLeaveRecordService.update(leaveRecordEntity);
-                                    }
+                                    attendanceLeaveRecordService.doUpdateRecord(processInstanceId,leaveRecordEntity);
 
                                     //假期余额
                                     AttendanceVacationBalanceEntity attendanceVacationBalanceEntity = new AttendanceVacationBalanceEntity();
@@ -649,6 +651,9 @@ public class DingMessageController {
 
         } catch (DingCallbackCrypto.DingTalkEncryptException e) {
             e.printStackTrace();
+        } catch (Exception e) {
+            log.info("请假记录表操作异常->"+e.toString());
+            throw new RuntimeException(e);
         }
         return null;
 

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

 package com.mortals.xhx.module.attendance.service;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.attendance.model.AttendanceLeaveRecordEntity;
+import com.mortals.xhx.module.attendance.model.AttendanceLeaveRecordQuery;
+
 /**
 * AttendanceLeaveRecordService
 *
@@ -11,4 +13,6 @@ import com.mortals.xhx.module.attendance.model.AttendanceLeaveRecordEntity;
 */
 public interface AttendanceLeaveRecordService extends ICRUDService<AttendanceLeaveRecordEntity,Long>{
 
+    //根据remark（钉钉返回的id）查询对象
+    AttendanceLeaveRecordEntity doUpdateRecord(String processInstanceId,AttendanceLeaveRecordEntity leaveRecordEntity) throws Exception;
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.attendance.service.impl;
-import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.util.DateUtils;
+import com.mortals.framework.util.ThreadPool;
+import com.mortals.xhx.common.utils.AttendSummaryThread;
 import com.mortals.xhx.module.attendance.model.vo.AttendanceSummaryQuery;
 import com.mortals.xhx.module.attendance.service.AttendanceStatService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,9 +12,6 @@ import com.mortals.framework.model.Context;
 import com.mortals.xhx.module.attendance.dao.AttendanceLeaveRecordDao;
 import com.mortals.xhx.module.attendance.model.AttendanceLeaveRecordEntity;
 import com.mortals.xhx.module.attendance.service.AttendanceLeaveRecordService;
-
-import static com.mortals.xhx.common.key.RedisKey.KEY_ATTENDANCE_STAT_CACHE;
-
 /**
 * AttendanceLeaveRecordService
 * 请假记录信息 service实现
@@ -26,8 +24,6 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
 
     @Autowired
     private AttendanceStatService attendanceStatService;
-    @Autowired
-    private ICacheService cacheService;
 
     @Override
     protected void updateAfter(AttendanceLeaveRecordEntity entity, Context context) throws AppException {
@@ -37,10 +33,8 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
             query.setStaffId(entity.getLeavePersonId());
             query.setSummaryTimeStart(DateUtils.getStrDate(entity.getStartTime()));
             query.setSummaryTimeEnd(DateUtils.getStrDate(entity.getEndTime()));
-//            AttendSummaryThread summaryThread = new AttendSummaryThread(attendanceStatService, query);
-//            ThreadPool.getInstance().execute(summaryThread);
-            cacheService.lpush(KEY_ATTENDANCE_STAT_CACHE,query);
-
+            AttendSummaryThread summaryThread = new AttendSummaryThread(attendanceStatService, query);
+            ThreadPool.getInstance().execute(summaryThread);
         }
     }
 }
\ No newline at end of file