From 380908e868b088d62c0e572457bffeea1cbfe8f8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 23 二月 2023 02:51:45 +0800
Subject: [PATCH] 优化加入智能水电表厂家
---
service-common/src/main/java/com/java110/common/cmd/attendanceClasses/CheckInCmd.java | 46 ++++++++++++++++++++--------------------------
1 files changed, 20 insertions(+), 26 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 8bc61f7..aa2e591 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
@@ -14,6 +14,7 @@
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.file.FileDto;
import com.java110.dto.org.OrgStaffRelDto;
import com.java110.dto.store.StoreUserDto;
@@ -21,6 +22,7 @@
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;
@@ -94,7 +96,7 @@
private IFileInnerServiceSMO fileInnerServiceSMOImpl;
@Autowired
- private IOrgStaffRelV1InnerServiceSMO orgStaffRelV1InnerServiceSMOImpl;
+ private IAttendanceClassesStaffV1InnerServiceSMO attendanceClassesStaffV1InnerServiceSMOImpl;
@Autowired
private IPhotoSMO photoSMOImpl;
@@ -122,33 +124,25 @@
Assert.listOnlyOne(storeUserDtos, "鍛樺伐涓嶅瓨鍦�");
- OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto();
- orgStaffRelDto.setStoreId(storeUserDtos.get(0).getStoreId());
- orgStaffRelDto.setStaffId(reqJson.getString("staffId"));
- List<OrgStaffRelDto> orgStaffRelDtos = orgStaffRelV1InnerServiceSMOImpl.queryOrgStaffRels(orgStaffRelDto);
+ AttendanceClassesStaffDto attendanceClassesStaffDto = new AttendanceClassesStaffDto();
+ attendanceClassesStaffDto.setStaffId(reqJson.getString("staffId"));
+ attendanceClassesStaffDto.setStoreId(storeUserDtos.get(0).getStoreId());
+ List<AttendanceClassesStaffDto> attendanceClassesStaffs = attendanceClassesStaffV1InnerServiceSMOImpl.queryAttendanceClassesStaffs(attendanceClassesStaffDto);
- if(orgStaffRelDtos == null || orgStaffRelDtos.size() < 1){
+ if (attendanceClassesStaffs == null || attendanceClassesStaffs.size() < 1) {
throw new CmdException("鍛樺伐娌℃湁鑰冨嫟浠诲姟");
}
- List<String> orgIds = new ArrayList<>();
- for(OrgStaffRelDto orgStaffRelDto1: orgStaffRelDtos){
- orgIds.add(orgStaffRelDto1.getOrgId());
- }
-
- // 鑰冨嫟鐝鏄惁瀛樺湪
- AttendanceClassesDto attendanceClassesDto = new AttendanceClassesDto();
- attendanceClassesDto.setStoreId(storeUserDtos.get(0).getStoreId());
- attendanceClassesDto.setClassesObjIds(orgIds.toArray(new String[orgIds.size()]));
- List<AttendanceClassesDto> attendanceClassesDtos = attendanceClassesV1InnerServiceSMOImpl.queryAttendanceClassess(attendanceClassesDto);
-
- if(attendanceClassesDtos == null || attendanceClassesDtos.size() < 1){
- throw new CmdException("鐝涓嶅瓨鍦�");
- }
-
- // Assert.listOnlyOne(attendanceClassesDtos, "鐝涓嶅瓨鍦�");
- for(AttendanceClassesDto tmpAttendanceClassesDto : attendanceClassesDtos) {
- doCheckInAttendanceLog(context, reqJson, storeUserDtos, userDtos, tmpAttendanceClassesDto);
+ for (AttendanceClassesStaffDto tmpAttendanceClassesStaffDto : attendanceClassesStaffs) {
+ // 鑰冨嫟鐝鏄惁瀛樺湪
+ AttendanceClassesDto attendanceClassesDto = new AttendanceClassesDto();
+ attendanceClassesDto.setStoreId(storeUserDtos.get(0).getStoreId());
+ attendanceClassesDto.setClassesId(tmpAttendanceClassesStaffDto.getClassesId());
+ List<AttendanceClassesDto> attendanceClassesDtos = attendanceClassesV1InnerServiceSMOImpl.queryAttendanceClassess(attendanceClassesDto);
+ if (attendanceClassesDtos == null || attendanceClassesDtos.size() < 1) {
+ throw new CmdException("鐝涓嶅瓨鍦�");
+ }
+ doCheckInAttendanceLog(context, reqJson, storeUserDtos, userDtos, attendanceClassesDtos.get(0));
}
}
@@ -171,8 +165,8 @@
attendanceLogPo.setStoreId(storeUserDtos.get(0).getStoreId());
attendanceLogPo.setStaffId(reqJson.getString("staffId"));
attendanceLogPo.setClockTime(reqJson.getString("checkTime"));
- attendanceLogPo.setDepartmentId(attendanceClassesDto.getClassesObjId());
- attendanceLogPo.setDepartmentName(attendanceClassesDto.getClassesObjName());
+ attendanceLogPo.setDepartmentId(attendanceClassesDto.getClassesId());
+ attendanceLogPo.setDepartmentName(attendanceClassesDto.getClassesName());
attendanceLogPo.setStaffName(userDtos.get(0).getName());
attendanceLogPo.setFacePath(photo);
--
Gitblit v1.8.0