From e569dcc6da8b7be3ce3983664eb4b0b535425531 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期六, 13 四月 2024 15:03:05 +0800
Subject: [PATCH] 增加功能：员工统计时间段搜索、上报按修改人
---
framework/src/main/java/com/yuanchu/mom/utils/QueryWrappers.java | 6 ++++++
data-server/src/main/java/com/yuanchu/mom/dto/RegistrantCountDto.java | 7 +++++++
data-server/src/main/java/com/yuanchu/mom/mapper/DataReportingMapper.java | 2 +-
data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java | 4 ++--
data-server/src/main/resources/mapper/DataReportingMapper.xml | 1 +
5 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/data-server/src/main/java/com/yuanchu/mom/dto/RegistrantCountDto.java b/data-server/src/main/java/com/yuanchu/mom/dto/RegistrantCountDto.java
index 0df5a85..18c6d4f 100644
--- a/data-server/src/main/java/com/yuanchu/mom/dto/RegistrantCountDto.java
+++ b/data-server/src/main/java/com/yuanchu/mom/dto/RegistrantCountDto.java
@@ -16,6 +16,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.List;
@Data
@AllArgsConstructor
@@ -153,4 +154,10 @@
@ApiModelProperty("鍒涘缓鐢ㄦ埛")
private Integer createUser;
+ @TableField(exist = false)
+ private String startTime;
+
+ @TableField(exist = false)
+ private String endTime;
+
}
diff --git a/data-server/src/main/java/com/yuanchu/mom/mapper/DataReportingMapper.java b/data-server/src/main/java/com/yuanchu/mom/mapper/DataReportingMapper.java
index b4a461a..37523cb 100644
--- a/data-server/src/main/java/com/yuanchu/mom/mapper/DataReportingMapper.java
+++ b/data-server/src/main/java/com/yuanchu/mom/mapper/DataReportingMapper.java
@@ -27,7 +27,7 @@
IPage<ProductCountDto> selectProductCountDtoPageList(IPage<ProductCountDto> page, QueryWrapper<ProductCountDto> ew);
- IPage<RegistrantCountDto> selectRegistrantCountDtoPageList(IPage<RegistrantCountDto> page, QueryWrapper<RegistrantCountDto> ew);
+ IPage<RegistrantCountDto> selectRegistrantCountDtoPageList(IPage<RegistrantCountDto> page, QueryWrapper<RegistrantCountDto> ew, String startTime, String endTime);
Map<String, BigDecimal> getDataFor1();
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;
}
diff --git a/data-server/src/main/resources/mapper/DataReportingMapper.xml b/data-server/src/main/resources/mapper/DataReportingMapper.xml
index ff38784..41bbdfe 100644
--- a/data-server/src/main/resources/mapper/DataReportingMapper.xml
+++ b/data-server/src/main/resources/mapper/DataReportingMapper.xml
@@ -78,6 +78,7 @@
date_format(create_time, '%Y-%m-%d') create_time,
create_user
from data_reporting
+ where create_time >= #{startTime} and create_time <= #{endTime}
group by name2,product, date_format(create_time, '%Y-%m-%d')
) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
diff --git a/framework/src/main/java/com/yuanchu/mom/utils/QueryWrappers.java b/framework/src/main/java/com/yuanchu/mom/utils/QueryWrappers.java
index b9b34a0..1040d4e 100644
--- a/framework/src/main/java/com/yuanchu/mom/utils/QueryWrappers.java
+++ b/framework/src/main/java/com/yuanchu/mom/utils/QueryWrappers.java
@@ -3,9 +3,11 @@
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.CustomLog;
import org.springframework.stereotype.Component;
@@ -44,10 +46,14 @@
e.printStackTrace();
throw new RuntimeException("鏌ヨ鏉′欢鐢熸垚閿欒");
}
+ boolean bool = field.isAnnotationPresent(TableField.class);
// System.out.println(field.getName() + "|" + (value == null || value.equals("")) + "|" + value);
if(value == null || value.equals("")){
continue;
}
+ if (bool){
+ if(!field.getAnnotation(TableField.class).exist())continue;
+ }
if (!field.getName().equals("orderBy")) {
if(value.getClass()== LocalDateTime.class){
wrapper.like(StrUtil.toUnderlineCase(field.getName()), ((LocalDateTime) value).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
--
Gitblit v1.9.3