From 4cb2c280c69a7d6bb48b831df60f5f1a793097b5 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 19 四月 2023 01:00:00 +0800
Subject: [PATCH] 优化部分不合规代码
---
service-common/src/main/java/com/java110/common/api/AttendanceClassApi.java | 46 +++++++++-------------------------------------
1 files changed, 9 insertions(+), 37 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
index a6309ca..5b4c069 100755
--- a/service-common/src/main/java/com/java110/common/api/AttendanceClassApi.java
+++ b/service-common/src/main/java/com/java110/common/api/AttendanceClassApi.java
@@ -29,8 +29,8 @@
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.AttendanceClassesTaskDto;
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;
@@ -269,43 +269,7 @@
return getAttendanceClassesTaskDetailBMOImpl.get(attendanceClassesTaskDetailDto);
}
- /**
- * 娣诲姞璁惧鎺ュ彛绫�
- *
- * @return 鎴愬姛鎴栬�呭け璐�
- * @throws Exception
- * @serviceCode /attendanceClass/getMonthAttendance
- * @path /app/attendanceClass/getMonthAttendance
- */
- @RequestMapping(path = "/getMonthAttendance", method = RequestMethod.GET)
- public ResponseEntity<String> getMonthAttendance(
- @RequestHeader(value = "store-id") String storeId,
- @RequestParam int page,
- @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 {
- AttendanceClassesTaskDto attendanceClassesTaskDto = new AttendanceClassesTaskDto();
- attendanceClassesTaskDto.setPage(page);
- attendanceClassesTaskDto.setRow(row);
- attendanceClassesTaskDto.setClassId(classesId);
- attendanceClassesTaskDto.setStaffName(staffName);
- attendanceClassesTaskDto.setStaffId(staffId);
- attendanceClassesTaskDto.setStoreId(storeId);
-
- 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) + "");
- }
- return getAttendanceClassesTaskDetailBMOImpl.getMonthAttendance(attendanceClassesTaskDto);
- }
/**
@@ -375,12 +339,20 @@
*/
@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