diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordErrorController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordErrorController.java index 3be9aa49fa3633969c1903c300d0fdc394dad5dd..c314782e97cad8996c49e3db6568eab20d9706fe 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordErrorController.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordErrorController.java @@ -10,7 +10,11 @@ import com.mortals.framework.service.IUser; import com.mortals.framework.util.DateUtils; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.xhx.base.system.param.service.ParamService; +import com.mortals.xhx.busiz.h5.req.AttendSaveReq; +import com.mortals.xhx.busiz.h5.web.ApiWebPerformController; import com.mortals.xhx.common.code.ErrorStatusEnum; +import com.mortals.xhx.common.code.ProcessStatusEnum; +import com.mortals.xhx.common.code.YesNoEnum; import com.mortals.xhx.module.attendance.model.*; import com.mortals.xhx.module.attendance.service.*; import com.mortals.xhx.module.dept.model.DeptQuery; @@ -72,6 +76,8 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont @Autowired private AttendanceRecordErrorService errorService; + @Autowired + private ApiWebPerformController apiWebPerformController; public AttendanceRecordErrorController() { super.setModuleDesc("鑰冨嫟鎵撳崱璁板綍寮傚父淇℃伅"); @@ -137,6 +143,7 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont 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()); @@ -209,6 +216,51 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont super.saveBefore(entity, model, context); } + + @Override + protected int saveAfter(AttendanceRecordErrorEntity entity, Map<String, Object> model, Context context) throws AppException { + if(YesNoEnum.YES.getValue()==entity.getProcessStatus()){ + //宸茬粡澶勭悊锛屾牴鎹敊璇姸鎬佹彁浜よ€冨嫟缁╂晥 + String ruleCode=""; + + if(ErrorStatusEnum.鏃╅€€.getValue()==entity.getErrorStatus()){ + + //鍒ゆ柇鏃堕棿宸畾涔� + + //entity.getErrorStatus() + } + + + + +/* AttendSaveReq attendSaveReq = new AttendSaveReq(); + attendSaveReq.setAttendanceGroupId(entity.getAttendanceGroupId()); + attendSaveReq.setAttendanceGroupName(entity.getAttendanceGroupName()); + attendSaveReq.setAttendanceDate(entity.getActualAttendanceDateTime()); + attendSaveReq.setErrorTime(entity.getErrorDateTime()); + attendSaveReq.setGoOffTimeStr(entity.getGoOrOff()); + attendSaveReq.setActualAttendTime(); + attendSaveReq.setErrorResult(entity.getRemark()); + attendSaveReq.setExt(); + attendSaveReq.setWorkNum(); + attendSaveReq.setTitle(); + attendSaveReq.setHappenTime(entity.getErrorDateTime()); + attendSaveReq.setRuleCode(ruleCode); + attendSaveReq.setRuleId(); + attendSaveReq.setPhone(); + attendSaveReq.setPerformType(); + attendSaveReq.setStaffId();*/ + + + // apiWebPerformController.attendSave(attendSaveReq); + + } + + + + return super.saveAfter(entity, model, context); + } + @Override protected int editAfter(Long id, Map<String, Object> model, AttendanceRecordErrorEntity entity, Context context) throws AppException { this.addDict(model, "errorStatus", paramService.getParamBySecondOrganize("AttendanceRecordDetail", "goWorkResult"));