From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-common/src/main/java/com/java110/common/cmd/attendanceClasses/CheckInCmd.java | 67 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 15 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 e14fb20..fa89ad9 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,33 +1,28 @@
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;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.smo.IPhotoSMO;
import com.java110.doc.annotation.*;
-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.attendance.AttendanceClassesDto;
+import com.java110.dto.attendance.AttendanceClassesTaskDetailDto;
+import com.java110.dto.attendance.AttendanceClassesTaskDto;
+import com.java110.dto.attendance.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;
+import com.java110.po.attendance.AttendanceClassesTaskPo;
+import com.java110.po.attendance.AttendanceClassesTaskDetailPo;
+import com.java110.po.attendance.AttendanceLogPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
@@ -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;
@@ -182,9 +176,26 @@
attendanceClassesTaskDetailDto.setNowCheckTime(reqJson.getString("checkTime"));
attendanceClassesTaskDetailDto.setClassId(attendanceClassesDto.getClassesId());
attendanceClassesTaskDetailDto.setStaffId(reqJson.getString("staffId"));
+ attendanceClassesTaskDetailDto.setState(AttendanceClassesTaskDetailDto.STATE_WAIT);
List<AttendanceClassesTaskDetailDto> attendanceClassesTaskDetailDtos = attendanceClassesTaskDetailInnerServiceSMOImpl.queryAttendanceClassesTaskDetails(attendanceClassesTaskDetailDto);
if (attendanceClassesTaskDetailDtos == null || attendanceClassesTaskDetailDtos.size() < 1) {
+ attendanceClassesTaskDetailDto = new AttendanceClassesTaskDetailDto();
+ attendanceClassesTaskDetailDto.setNowCheckTime(reqJson.getString("checkTime"));
+ attendanceClassesTaskDetailDto.setClassId(attendanceClassesDto.getClassesId());
+ attendanceClassesTaskDetailDto.setStaffId(reqJson.getString("staffId"));
+ attendanceClassesTaskDetailDtos = attendanceClassesTaskDetailInnerServiceSMOImpl.queryAttendanceClassesTaskDetails(attendanceClassesTaskDetailDto);
+
+ 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(), "鏈埌鏃堕棿");
context.setResponseEntity(ResultVo.error("鏈埌鏃堕棿"));
return;
}
@@ -199,8 +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(), specName + "鑰冨嫟澶辫触");
throw new CmdException("鑰冨嫟澶辫触");
}
@@ -219,9 +235,30 @@
flag = attendanceClassesTaskInnerServiceSMOImpl.updateAttendanceClassesTask(attendanceClassesTaskPo);
- if (flag < 1) {
- throw new CmdException("鑰冨嫟澶辫触");
+// if (flag < 1) {
+// updateAttendanceLogRemark(attendanceLogPo.getLogId(), specName + "鑰冨嫟澶辫触");
+// throw new CmdException("鑰冨嫟澶辫触");
+// }
+
+ String msg = "鎵撳崱鎴愬姛";
+ if (AttendanceClassesTaskDetailDto.STATE_LATE.equals(attendanceClassesTaskDetailPo.getState())) {
+ msg = "鎵撳崱杩熷埌";
}
+
+ if (AttendanceClassesTaskDetailDto.STATE_LEAVE.equals(attendanceClassesTaskDetailPo.getState())) {
+ msg = "鎵撳崱鏃╅��";
+ }
+ updateAttendanceLogRemark(attendanceLogPo.getLogId(), specName + msg);
+ context.setResponseEntity(ResultVo.createResponseEntity(ResultVo.CODE_OK, msg));
+
+ }
+
+ private void updateAttendanceLogRemark(String logId, String remark) {
+
+ AttendanceLogPo attendanceLogPo = new AttendanceLogPo();
+ attendanceLogPo.setLogId(logId);
+ attendanceLogPo.setRemark(remark.length() > 1000 ? remark.substring(0, 1000) : remark);
+ attendanceLogInnerServiceSMOImpl.updateAttendanceLog(attendanceLogPo);
}
/**
--
Gitblit v1.8.0