From a70919b4f7baab856125f36e5bd41f5ee81be680 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 13 五月 2025 09:41:35 +0800
Subject: [PATCH] 修改年份切换字段不为必填
---
src/main/java/com/cl/service/impl/DataServiceImpl.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 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..6856acd 100644
--- a/src/main/java/com/cl/service/impl/DataServiceImpl.java
+++ b/src/main/java/com/cl/service/impl/DataServiceImpl.java
@@ -15,10 +15,15 @@
import com.cl.pojo.vo.EditDataDTO;
import com.cl.pojo.vo.screen.*;
import com.cl.service.DataService;
+import io.swagger.models.auth.In;
+import net.bytebuddy.asm.Advice;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.text.DecimalFormat;
import java.time.LocalDateTime;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
@Service
public class DataServiceImpl extends ServiceImpl<DataMapper, DataEntity> implements DataService {
@@ -30,9 +35,13 @@
}
@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;
+ }
screenVO.setAssistiveDeviceTotal(data.getAssistiveDeviceTotal());
screenVO.setCreateTime(data.getCreateTime());
screenVO.setTechnicalTraining(data.getTechnicalTraining());
@@ -107,7 +116,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 +184,29 @@
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;
+ }
+
+ @Override
+ public List<Integer> getYearList(Integer county) {
+ return dataMapper.getYearList( county);
+
+ }
+
+ @Override
+ public Integer getAssistiveDeviceTotal(Integer county, Integer year) {
+ LocalDateTime createTime = LocalDateTime.of(year, 12, 31, 23, 59, 59);
+ return dataMapper.getAssistiveDeviceTotal(county,createTime);
+ }
+
private DataRateVO getRateVO(EditDataDTO data, EditDataDTO beforeData) {
if (beforeData == null || beforeData.equals(new EditDataDTO())) {
return null;
--
Gitblit v1.7.1