From c151ec18d4d302a6359a8ef4144835c254c842bc Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 12 五月 2025 16:17:10 +0800
Subject: [PATCH] 大屏加年份条件切换
---
src/main/java/com/cl/service/impl/DataServiceImpl.java | 6 +++---
src/main/resources/mapper/DataMapper.xml | 1 +
src/main/java/com/cl/mapper/DataMapper.java | 2 +-
src/main/java/com/cl/service/DataService.java | 2 +-
src/main/java/com/cl/controller/DataController.java | 6 ++++--
5 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/cl/controller/DataController.java b/src/main/java/com/cl/controller/DataController.java
index cc98f0a..190c305 100644
--- a/src/main/java/com/cl/controller/DataController.java
+++ b/src/main/java/com/cl/controller/DataController.java
@@ -101,8 +101,9 @@
*/
@PostMapping("/screen")
@ApiOperation("大屏数据")
- public Result<ScreenVO> screen(@RequestParam(value = "county",required = false)Integer county) {
- return Result.success( dataService.screen(county==null?0:county));
+ public Result<ScreenVO> screen(@RequestParam(value = "county",required = false)Integer county,
+ @RequestParam(value = "year")Integer year) {
+ return Result.success( dataService.screen(county==null?0:county,year));
}
/**
* 补贴总人数
@@ -110,6 +111,7 @@
@GetMapping("/getAssistiveDeviceTotal")
@ApiOperation("补贴总人数")
public Result<Integer> getAssistiveDeviceTotal(@RequestParam(value = "county",required = false)Integer county,@RequestParam("year") Integer year) {
+
return Result.success( dataService.getAssistiveDeviceTotal(county==null?0:county,year));
}
diff --git a/src/main/java/com/cl/mapper/DataMapper.java b/src/main/java/com/cl/mapper/DataMapper.java
index 2fefd4f..846cbc9 100644
--- a/src/main/java/com/cl/mapper/DataMapper.java
+++ b/src/main/java/com/cl/mapper/DataMapper.java
@@ -13,7 +13,7 @@
@Mapper
public interface DataMapper extends BaseMapper<DataEntity> {
- DataEntity screen(Integer county);
+ DataEntity screen( @Param("county") Integer county,@Param("createTime")LocalDateTime createTime);
IPage<DataVO> pageList(IPage<DataEntity> page, @Param("countyList") List<Integer> countyList, @Param("name") String name);
diff --git a/src/main/java/com/cl/service/DataService.java b/src/main/java/com/cl/service/DataService.java
index 23323e4..7f9155f 100644
--- a/src/main/java/com/cl/service/DataService.java
+++ b/src/main/java/com/cl/service/DataService.java
@@ -14,7 +14,7 @@
import java.util.List;
public interface DataService extends IService<DataEntity> {
- ScreenVO screen(Integer county);
+ ScreenVO screen(Integer county,Integer year);
void add( AddDataDTO addDataDTO);
diff --git a/src/main/java/com/cl/service/impl/DataServiceImpl.java b/src/main/java/com/cl/service/impl/DataServiceImpl.java
index 8a21d05..6856acd 100644
--- a/src/main/java/com/cl/service/impl/DataServiceImpl.java
+++ b/src/main/java/com/cl/service/impl/DataServiceImpl.java
@@ -35,10 +35,10 @@
}
@Override
- public ScreenVO screen(Integer county) {
-
+ public ScreenVO screen(Integer county,Integer year) {
+ LocalDateTime createTime = LocalDateTime.of(year, 12, 31, 23, 59, 59);
ScreenVO screenVO = new ScreenVO();
- DataEntity data =dataMapper.screen(county);
+ DataEntity data =dataMapper.screen(county,createTime);
if (null== data) {
return screenVO;
}
diff --git a/src/main/resources/mapper/DataMapper.xml b/src/main/resources/mapper/DataMapper.xml
index 41011ac..845ccd8 100644
--- a/src/main/resources/mapper/DataMapper.xml
+++ b/src/main/resources/mapper/DataMapper.xml
@@ -10,6 +10,7 @@
ROW_NUMBER() OVER (PARTITION BY county ORDER BY create_time DESC) AS rn
FROM t_data
WHERE del_flag = 0
+ AND create_time < #{createTime}
<if test="county!=null and county !=0">
and county=#{county}
</if>
--
Gitblit v1.7.1