From 03e22f45b1b06b68a3ba8b9390e9a5f1ddda752a Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 06 五月 2025 18:29:25 +0800
Subject: [PATCH] 分页条件修改，区县可多选 token过期code改为401
---
src/main/java/com/cl/service/impl/DataServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/cl/service/impl/DataServiceImpl.java b/src/main/java/com/cl/service/impl/DataServiceImpl.java
index 7ca97a4..c2e9201 100644
--- a/src/main/java/com/cl/service/impl/DataServiceImpl.java
+++ b/src/main/java/com/cl/service/impl/DataServiceImpl.java
@@ -15,10 +15,12 @@
import com.cl.pojo.vo.EditDataDTO;
import com.cl.pojo.vo.screen.*;
import com.cl.service.DataService;
+import io.swagger.models.auth.In;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.text.DecimalFormat;
import java.time.LocalDateTime;
+import java.util.List;
@Service
public class DataServiceImpl extends ServiceImpl<DataMapper, DataEntity> implements DataService {
@@ -107,7 +109,7 @@
}
@Override
- public IPage<DataVO> pageList(IPage<DataEntity> page, Integer county, String name) {
+ public IPage<DataVO> pageList(IPage<DataEntity> page, List<Integer> county, String name) {
return dataMapper.pageList(page,county,name);
}
@@ -175,6 +177,17 @@
return dataDetailVO;
}
+ @Override
+ public DataDetailVO addDetail(Integer county) {
+ DataDetailVO dataDetailVO = new DataDetailVO();
+ //通过区县获取上一次数据
+ DataEntity dataEntity = dataMapper.getAddDetail(county);
+ EditDataDTO editDataDTO=new EditDataDTO();
+ BeanUtils.copyProperties(dataEntity,editDataDTO);
+ dataDetailVO.setBeforeData(editDataDTO);
+ return dataDetailVO;
+ }
+
private DataRateVO getRateVO(EditDataDTO data, EditDataDTO beforeData) {
if (beforeData == null || beforeData.equals(new EditDataDTO())) {
return null;
--
Gitblit v1.7.1