From ae42d2da37fe9d161e7058b51367b95f24c3d97a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 13 六月 2023 15:11:36 +0800
Subject: [PATCH] optimize
---
service-common/src/main/java/com/java110/common/cmd/attendanceClasses/CheckInCmd.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/attendanceClasses/CheckInCmd.java b/service-common/src/main/java/com/java110/common/cmd/attendanceClasses/CheckInCmd.java
index 880894f..27e4ef6 100644
--- a/service-common/src/main/java/com/java110/common/cmd/attendanceClasses/CheckInCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/attendanceClasses/CheckInCmd.java
@@ -1,10 +1,8 @@
package com.java110.common.cmd.attendanceClasses;
import com.alibaba.fastjson.JSONObject;
-import com.java110.common.smo.impl.AttendanceClassesTaskDetailInnerServiceSMOImpl;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.client.FileUploadTemplate;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -14,17 +12,14 @@
import com.java110.dto.attendanceClasses.AttendanceClassesDto;
import com.java110.dto.attendanceClasses.AttendanceClassesTaskDetailDto;
import com.java110.dto.attendanceClasses.AttendanceClassesTaskDto;
-import com.java110.dto.attendanceClassesStaff.AttendanceClassesStaffDto;
+import com.java110.dto.attendanceClasses.AttendanceClassesStaffDto;
import com.java110.dto.file.FileDto;
-import com.java110.dto.org.OrgStaffRelDto;
import com.java110.dto.store.StoreUserDto;
import com.java110.dto.user.UserDto;
import com.java110.intf.common.*;
-import com.java110.intf.store.IOrgStaffRelV1InnerServiceSMO;
import com.java110.intf.store.IStoreInnerServiceSMO;
import com.java110.intf.user.IAttendanceClassesStaffV1InnerServiceSMO;
import com.java110.intf.user.IUserV1InnerServiceSMO;
-import com.java110.po.attendanceClasses.AttendanceClassesPo;
import com.java110.po.attendanceClassesTask.AttendanceClassesTaskPo;
import com.java110.po.attendanceClassesTaskDetail.AttendanceClassesTaskDetailPo;
import com.java110.po.attendanceLog.AttendanceLogPo;
@@ -36,7 +31,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import java.text.ParseException;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -192,12 +186,16 @@
attendanceClassesTaskDetailDto.setStaffId(reqJson.getString("staffId"));
attendanceClassesTaskDetailDtos = attendanceClassesTaskDetailInnerServiceSMOImpl.queryAttendanceClassesTaskDetails(attendanceClassesTaskDetailDto);
- if (attendanceClassesTaskDetailDtos != null || attendanceClassesTaskDetailDtos.size() > 0) {
- updateAttendanceLogRemark(attendanceLogPo.getLogId(),"閲嶅鎵撳崱");
+ if (attendanceClassesTaskDetailDtos != null && attendanceClassesTaskDetailDtos.size() > 0) {
+ String specName = "涓婄彮:";
+ if (!AttendanceClassesTaskDetailDto.SPEC_CD_START.equals(attendanceClassesTaskDetailDtos.get(0).getSpecCd())) {
+ specName = "涓嬬彮:";
+ }
+ updateAttendanceLogRemark(attendanceLogPo.getLogId(), specName + "閲嶅鎵撳崱");
context.setResponseEntity(ResultVo.error("閲嶅鎵撳崱"));
return;
}
- updateAttendanceLogRemark(attendanceLogPo.getLogId(),"鏈埌鏃堕棿");
+ updateAttendanceLogRemark(attendanceLogPo.getLogId(), "鏈埌鏃堕棿");
context.setResponseEntity(ResultVo.error("鏈埌鏃堕棿"));
return;
}
@@ -212,9 +210,13 @@
attendanceClassesTaskDetailPo.setState(getState(nowAttendanceClassesTaskDetailDto, DateUtil.getDateFromStringA(reqJson.getString("checkTime"))));
attendanceClassesTaskDetailPo.setFacePath(photo);
flag = attendanceClassesTaskDetailInnerServiceSMOImpl.updateAttendanceClassesTaskDetail(attendanceClassesTaskDetailPo);
+ String specName = "涓婄彮:";
+ if (!AttendanceClassesTaskDetailDto.SPEC_CD_START.equals(nowAttendanceClassesTaskDetailDto.getSpecCd())) {
+ specName = "涓嬬彮:";
+ }
if (flag < 1) {
- updateAttendanceLogRemark(attendanceLogPo.getLogId(),"鑰冨嫟澶辫触");
+ updateAttendanceLogRemark(attendanceLogPo.getLogId(), specName + "鑰冨嫟澶辫触");
throw new CmdException("鑰冨嫟澶辫触");
}
@@ -233,20 +235,20 @@
flag = attendanceClassesTaskInnerServiceSMOImpl.updateAttendanceClassesTask(attendanceClassesTaskPo);
- if (flag < 1) {
- updateAttendanceLogRemark(attendanceLogPo.getLogId(),"鑰冨嫟澶辫触");
- throw new CmdException("鑰冨嫟澶辫触");
- }
+// if (flag < 1) {
+// updateAttendanceLogRemark(attendanceLogPo.getLogId(), specName + "鑰冨嫟澶辫触");
+// throw new CmdException("鑰冨嫟澶辫触");
+// }
String msg = "鎵撳崱鎴愬姛";
if (AttendanceClassesTaskDetailDto.STATE_LATE.equals(attendanceClassesTaskDetailPo.getState())) {
- msg = "鎵撳紑杩熷埌";
+ msg = "鎵撳崱杩熷埌";
}
if (AttendanceClassesTaskDetailDto.STATE_LEAVE.equals(attendanceClassesTaskDetailPo.getState())) {
- msg = "鎵撳紑鏃╅��";
+ msg = "鎵撳崱鏃╅��";
}
- updateAttendanceLogRemark(attendanceLogPo.getLogId(),msg);
+ updateAttendanceLogRemark(attendanceLogPo.getLogId(), specName + msg);
context.setResponseEntity(ResultVo.createResponseEntity(ResultVo.CODE_OK, msg));
}
@@ -255,7 +257,7 @@
AttendanceLogPo attendanceLogPo = new AttendanceLogPo();
attendanceLogPo.setLogId(logId);
- attendanceLogPo.setRemark(remark.length() > 1000?remark.substring(0,1000):remark);
+ attendanceLogPo.setRemark(remark.length() > 1000 ? remark.substring(0, 1000) : remark);
attendanceLogInnerServiceSMOImpl.updateAttendanceLog(attendanceLogPo);
}
--
Gitblit v1.8.0