Merge remote-tracking branch 'origin/master'

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

@@ -2,6 +2,7 @@ package com.mortals.xhx.module.attendance.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.model.PageInfo;
+import com.mortals.xhx.busiz.h5.web.ApiWebPerformController;
 import com.mortals.xhx.module.attendance.model.AttendanceClassDetailEntity;
 import com.mortals.xhx.module.attendance.model.AttendanceClassEntity;
 import com.mortals.xhx.module.attendance.service.AttendanceClassDetailService;
@@ -34,6 +35,9 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
     @Autowired
     private AttendanceClassService attendanceClassService;
 
+    @Autowired
+    private ApiWebPerformController apiWebPerformController;
+
 
     @Override
     protected void findAfter(AttendanceRecordErrorEntity params, PageInfo pageInfo, Context context, List<AttendanceRecordErrorEntity> list) throws AppException {
@@ -60,4 +64,10 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
             }
         });
     }
+
+
+    @Override
+    protected void updateAfter(AttendanceRecordErrorEntity entity, Context context) throws AppException {
+
+    }
 }
\ No newline at end of file

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

@@ -76,8 +76,7 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont
 
     @Autowired
     private AttendanceRecordErrorService errorService;
-    @Autowired
-    private ApiWebPerformController apiWebPerformController;
+
 
     public AttendanceRecordErrorController() {
         super.setModuleDesc("考勤打卡记录异常信息");
@@ -142,14 +141,24 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont
     protected void saveBefore(AttendanceRecordErrorEntity entity, Map<String, Object> model, Context context) throws AppException {
 
         for (AttendanceRecordErrorEntity recordErrorEntity : entity.getRecordErrorEntities()) {
-            recordErrorEntity.setProcessStatus(entity.getProcessStatus());
-            recordErrorEntity.setGoOffDateTime(null);
-            recordErrorEntity.setProcessResult(entity.getProcessResult());
-            recordErrorEntity.setOpertor(context.getUser().getRealName());
-            recordErrorEntity.setOperDateTime(new Date());
-            recordErrorEntity.setRemark(entity.getRemark());
+            AttendanceRecordErrorEntity updateEntity = new AttendanceRecordErrorEntity();
+            updateEntity.setId(recordErrorEntity.getId());
+            updateEntity.setProcessStatus(entity.getProcessStatus());
+            updateEntity.setGoOffDateTime(null);
+            updateEntity.setProcessResult(entity.getProcessResult());
+            updateEntity.setOpertor(context.getUser().getRealName());
+            updateEntity.setOperDateTime(new Date());
+            updateEntity.setRemark(entity.getRemark());
+            updateEntity.setUpdateTime(new Date());
+            updateEntity.setUpdateUserId(this.getContextUserId(getContext()));
+            this.service.update(recordErrorEntity, getContext());
         }
-        this.batchSave(entity.getRecordErrorEntities());
+/*
+        if(!ObjectUtils.isEmpty(entity.getRecordErrorEntities())){
+
+            this.batchSave(entity.getRecordErrorEntities());
+        }
+        */
 
         for (AttendanceRecordErrorEntity item : entity.getRecordErrorEntities()) {
             DateUtils.convertTime2Str(item.getErrorDateTime().getTime(), DateUtils.P_yyyy_MM_dd);
@@ -219,11 +228,11 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont
 
     @Override
     protected int saveAfter(AttendanceRecordErrorEntity entity, Map<String, Object> model, Context context) throws AppException {
-        if(YesNoEnum.YES.getValue()==entity.getProcessStatus()){
+        if (YesNoEnum.YES.getValue() == entity.getProcessStatus()) {
             //已经处理，根据错误状态提交考勤绩效
-            String ruleCode="";
+            String ruleCode = "";
 
-            if(ErrorStatusEnum.早退.getValue()==entity.getErrorStatus()){
+            if (ErrorStatusEnum.早退.getValue() == entity.getErrorStatus()) {
 
                 //判断时间差定义
 
@@ -252,12 +261,11 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont
             attendSaveReq.setStaffId();*/
 
 
-           // apiWebPerformController.attendSave(attendSaveReq);
+            // apiWebPerformController.attendSave(attendSaveReq);
 
         }
 
 
-
         return super.saveAfter(entity, model, context);
     }