From 2fa59cb896243a42623dfb210dc5f426d9f93a78 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 22 二月 2023 00:23:56 +0800
Subject: [PATCH] 优化考勤人员
---
service-common/src/main/java/com/java110/common/api/AttendanceClassApi.java | 130 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 118 insertions(+), 12 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/api/AttendanceClassApi.java b/service-common/src/main/java/com/java110/common/api/AttendanceClassApi.java
old mode 100644
new mode 100755
index 12394e4..5f7d988
--- a/service-common/src/main/java/com/java110/common/api/AttendanceClassApi.java
+++ b/service-common/src/main/java/com/java110/common/api/AttendanceClassApi.java
@@ -25,10 +25,16 @@
import com.java110.common.bmo.attendanceClassesTaskDetail.IGetAttendanceClassesTaskDetailBMO;
import com.java110.common.bmo.attendanceClassesTaskDetail.ISaveAttendanceClassesTaskDetailBMO;
import com.java110.common.bmo.attendanceClassesTaskDetail.IUpdateAttendanceClassesTaskDetailBMO;
-import com.java110.dto.attendanceClassesTask.AttendanceClassesTaskDto;
-import com.java110.dto.attendanceClassesTaskDetail.AttendanceClassesTaskDetailDto;
+import com.java110.common.bmo.attendanceLog.IDeleteAttendanceLogBMO;
+import com.java110.common.bmo.attendanceLog.IGetAttendanceLogBMO;
+import com.java110.common.bmo.attendanceLog.ISaveAttendanceLogBMO;
+import com.java110.common.bmo.attendanceLog.IUpdateAttendanceLogBMO;
+import com.java110.dto.attendanceClasses.AttendanceClassesTaskDetailDto;
+import com.java110.dto.attendanceClasses.AttendanceClassesTaskDto;
+import com.java110.dto.attendanceClasses.AttendanceLogDto;
import com.java110.po.attendanceClassesTask.AttendanceClassesTaskPo;
import com.java110.po.attendanceClassesTaskDetail.AttendanceClassesTaskDetailPo;
+import com.java110.po.attendanceLog.AttendanceLogPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
@@ -73,6 +79,16 @@
@Autowired
private IGetAttendanceClassesTaskDetailBMO getAttendanceClassesTaskDetailBMOImpl;
+
+ @Autowired
+ private ISaveAttendanceLogBMO saveAttendanceLogBMOImpl;
+ @Autowired
+ private IUpdateAttendanceLogBMO updateAttendanceLogBMOImpl;
+ @Autowired
+ private IDeleteAttendanceLogBMO deleteAttendanceLogBMOImpl;
+
+ @Autowired
+ private IGetAttendanceLogBMO getAttendanceLogBMOImpl;
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
@@ -150,20 +166,22 @@
@RequestParam(value = "row") int row,
@RequestParam(value = "classId", required = false) String classId,
@RequestParam(value = "staffId", required = false) String staffId,
+ @RequestParam(value = "staffName", required = false) String staffName,
@RequestParam(name = "date", required = false) String date) throws Exception {
AttendanceClassesTaskDto attendanceClassesTaskDto = new AttendanceClassesTaskDto();
attendanceClassesTaskDto.setPage(page);
attendanceClassesTaskDto.setRow(row);
attendanceClassesTaskDto.setStoreId(storeId);
attendanceClassesTaskDto.setClassId(classId);
+ attendanceClassesTaskDto.setStaffName(staffName);
+ attendanceClassesTaskDto.setStaffId(staffId);
if (!StringUtil.isEmpty(date)) {
- Date reqDate = DateUtil.getDateFromString(date, DateUtil.DATE_FORMATE_STRING_B);
-
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(reqDate);
- attendanceClassesTaskDto.setTaskYear(calendar.get(Calendar.YEAR) + "");
- attendanceClassesTaskDto.setTaskMonth((calendar.get(Calendar.MONTH) + 1) + "");
- attendanceClassesTaskDto.setTaskDay(calendar.get(Calendar.DAY_OF_MONTH) + "");
+ String[] dates = date.split("-");
+ attendanceClassesTaskDto.setTaskYear(dates[0] + "");
+ attendanceClassesTaskDto.setTaskMonth(dates[1] + "");
+ if (dates.length == 3) {
+ attendanceClassesTaskDto.setTaskDay(dates[2] + "");
+ }
}
return getAttendanceClassesTaskBMOImpl.get(attendanceClassesTaskDto);
}
@@ -253,10 +271,11 @@
/**
* 娣诲姞璁惧鎺ュ彛绫�
- * @serviceCode /attendanceClass/getMonthAttendance
- * @path /app/attendanceClass/getMonthAttendance
+ *
* @return 鎴愬姛鎴栬�呭け璐�
* @throws Exception
+ * @serviceCode /attendanceClass/getMonthAttendance
+ * @path /app/attendanceClass/getMonthAttendance
*/
@RequestMapping(path = "/getMonthAttendance", method = RequestMethod.GET)
public ResponseEntity<String> getMonthAttendance(
@@ -265,6 +284,7 @@
@RequestParam int row,
@RequestParam(name = "classesId", required = false) String classesId,
@RequestParam(name = "staffName", required = false) String staffName,
+ @RequestParam(name = "staffId", required = false) String staffId,
@RequestParam(name = "date", required = false) String date,
@RequestParam(name = "departmentId", required = false) String departmentId
) throws Exception {
@@ -274,6 +294,7 @@
attendanceClassesTaskDto.setRow(row);
attendanceClassesTaskDto.setClassId(classesId);
attendanceClassesTaskDto.setStaffName(staffName);
+ attendanceClassesTaskDto.setStaffId(staffId);
attendanceClassesTaskDto.setStoreId(storeId);
if (!StringUtil.isEmpty(date)) {
@@ -283,7 +304,92 @@
attendanceClassesTaskDto.setTaskYear(calendar.get(Calendar.YEAR) + "");
attendanceClassesTaskDto.setTaskMonth((calendar.get(Calendar.MONTH) + 1) + "");
}
- return getAttendanceClassesTaskDetailBMOImpl.getMonthAttendance(attendanceClassesTaskDto);
+ return getAttendanceClassesTaskDetailBMOImpl.getMonthAttendance(attendanceClassesTaskDto);
+ }
+
+
+ /**
+ * 寰俊淇濆瓨娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /attendanceClass/saveAttendanceLog
+ * @path /app/attendanceClass/saveAttendanceLog
+ */
+ @RequestMapping(value = "/saveAttendanceLog", method = RequestMethod.POST)
+ public ResponseEntity<String> saveAttendanceLog(@RequestBody JSONObject reqJson) {
+
+ Assert.hasKeyAndValue(reqJson, "staffId", "璇锋眰鎶ユ枃涓湭鍖呭惈staffId");
+
+
+ AttendanceLogPo attendanceLogPo = BeanConvertUtil.covertBean(reqJson, AttendanceLogPo.class);
+ return saveAttendanceLogBMOImpl.save(attendanceLogPo);
+ }
+
+ /**
+ * 寰俊淇敼娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /attendanceClass/updateAttendanceLog
+ * @path /app/attendanceClass/updateAttendanceLog
+ */
+ @RequestMapping(value = "/updateAttendanceLog", method = RequestMethod.POST)
+ public ResponseEntity<String> updateAttendanceLog(@RequestBody JSONObject reqJson) {
+
+ Assert.hasKeyAndValue(reqJson, "staffId", "璇锋眰鎶ユ枃涓湭鍖呭惈staffId");
+ Assert.hasKeyAndValue(reqJson, "storeId", "璇锋眰鎶ユ枃涓湭鍖呭惈storeId");
+ Assert.hasKeyAndValue(reqJson, "logId", "logId涓嶈兘涓虹┖");
+
+
+ AttendanceLogPo attendanceLogPo = BeanConvertUtil.covertBean(reqJson, AttendanceLogPo.class);
+ return updateAttendanceLogBMOImpl.update(attendanceLogPo);
+ }
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /attendanceClass/deleteAttendanceLog
+ * @path /app/attendanceClass/deleteAttendanceLog
+ */
+ @RequestMapping(value = "/deleteAttendanceLog", method = RequestMethod.POST)
+ public ResponseEntity<String> deleteAttendanceLog(@RequestBody JSONObject reqJson) {
+ Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
+
+ Assert.hasKeyAndValue(reqJson, "logId", "logId涓嶈兘涓虹┖");
+
+
+ AttendanceLogPo attendanceLogPo = BeanConvertUtil.covertBean(reqJson, AttendanceLogPo.class);
+ return deleteAttendanceLogBMOImpl.delete(attendanceLogPo);
+ }
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param storeId 鍟嗘埛ID
+ * @return
+ * @serviceCode /attendanceClass/queryAttendanceLog
+ * @path /app/attendanceClass/queryAttendanceLog
+ */
+ @RequestMapping(value = "/queryAttendanceLog", method = RequestMethod.GET)
+ public ResponseEntity<String> queryAttendanceLog(@RequestHeader(value = "store-id") String storeId,
+ @RequestParam(name = "staffName", required = false) String staffName,
+ @RequestParam(name = "staffId", required = false) String staffId,
+ @RequestParam(name = "date", required = false) String date,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
+ AttendanceLogDto attendanceLogDto = new AttendanceLogDto();
+ attendanceLogDto.setPage(page);
+ attendanceLogDto.setRow(row);
+ attendanceLogDto.setStoreId(storeId);
+ attendanceLogDto.setStaffId(staffId);
+ attendanceLogDto.setStaffName(staffName);
+
+ attendanceLogDto.setClockTime(date);
+
+ return getAttendanceLogBMOImpl.get(attendanceLogDto);
}
}
--
Gitblit v1.8.0