From e569dcc6da8b7be3ce3983664eb4b0b535425531 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期六, 13 四月 2024 15:03:05 +0800
Subject: [PATCH] 增加功能：员工统计时间段搜索、上报按修改人
---
data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java b/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
index ffe8732..8bd8cdb 100644
--- a/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
+++ b/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
@@ -92,7 +92,7 @@
public Map<String, Object> selectDataReportingList(IPage<DataReportingPageDto> page, DataReportingPageDto dataReportingPageDto) {
Map<String, Object> map = new HashMap<>();
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectDataReportingList");
- if (map1.get("look") == 1) dataReportingPageDto.setCreateUser(map1.get("userId"));
+ if (map1.get("look") == 1) dataReportingPageDto.setUpdateUser(map1.get("userId"));
Integer power = authMapper.isPower(map1.get("userId"), "dataReportingPower");
if(power == 1){
dataReportingPageDto.setDepartment(dataReportingMapper.getUserDepartmentById(map1.get("userId")));
@@ -164,7 +164,7 @@
String name = dataReportingMapper.getUserNameById(map1.get("userId"));
registrantCountDto.setName2(name);
};
- map.put("body", dataReportingMapper.selectRegistrantCountDtoPageList(page, QueryWrappers.queryWrappers(registrantCountDto)));
+ map.put("body", dataReportingMapper.selectRegistrantCountDtoPageList(page, QueryWrappers.queryWrappers(registrantCountDto), registrantCountDto.getStartTime(), registrantCountDto.getEndTime()));
return map;
}
--
Gitblit v1.9.3