From 873197abd3ae5e447f57683031cea6896f0cf2aa Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 25 十月 2022 13:01:15 +0800
Subject: [PATCH] 加入营销商品功能
---
service-common/src/main/java/com/java110/common/api/AttendanceClassApi.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 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 713a838..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
@@ -29,9 +29,9 @@
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.attendanceClassesTask.AttendanceClassesTaskDto;
-import com.java110.dto.attendanceClassesTaskDetail.AttendanceClassesTaskDetailDto;
-import com.java110.dto.attendanceLog.AttendanceLogDto;
+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;
@@ -166,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);
}
@@ -282,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 {
@@ -291,6 +294,7 @@
attendanceClassesTaskDto.setRow(row);
attendanceClassesTaskDto.setClassId(classesId);
attendanceClassesTaskDto.setStaffName(staffName);
+ attendanceClassesTaskDto.setStaffId(staffId);
attendanceClassesTaskDto.setStoreId(storeId);
if (!StringUtil.isEmpty(date)) {
@@ -316,7 +320,6 @@
public ResponseEntity<String> saveAttendanceLog(@RequestBody JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "staffId", "璇锋眰鎶ユ枃涓湭鍖呭惈staffId");
- Assert.hasKeyAndValue(reqJson, "storeId", "璇锋眰鎶ユ枃涓湭鍖呭惈storeId");
AttendanceLogPo attendanceLogPo = BeanConvertUtil.covertBean(reqJson, AttendanceLogPo.class);
@@ -372,12 +375,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