From 66ee93f5df8418e065eb2d36e18157a4477386c7 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 09 Nov 2023 16:59:22 +0800
Subject: [PATCH] 人工上报返回年数据
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DbReportServiceImpl.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DbReportServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DbReportServiceImpl.java
index a9126b6..bec5525 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DbReportServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DbReportServiceImpl.java
@@ -23,15 +23,32 @@
List<DbReportVO> list = new ArrayList<>();
if (dbReport.getTimeFlag().equals("day")){
- if (dbReport.getType().equals("3")){
+ if (dbReport.getType().equals("wy")){
//位移
+ list = baseMapper.getDayListWy(dbReport);
}else{
list = baseMapper.getDayList(dbReport);
}
- }else if (dbReport.getTimeFlag().equals("year")){
+ }else if (dbReport.getTimeFlag().equals("month")){
+ if (dbReport.getType().equals("wy")){
+ //位移
+ list = baseMapper.getMonthListWy(dbReport);
+ }else{
+ list = baseMapper.getMonthList(dbReport);
+ }
+ } else if (dbReport.getTimeFlag().equals("year")) {
+ if (dbReport.getType().equals("wy")){
+ //位移
+ list = baseMapper.getYearListWy(dbReport);
+ }else{
+ list = baseMapper.getYearList(dbReport);
+ }
+
}
+
+
return list;
}
@@ -41,7 +58,15 @@
//先判断上报时间当天是否有
DbReport dbReport = baseMapper.getRecordTimeData(entity);
+ boolean result = false;
+ if (dbReport != null){
+ entity.setId(dbReport.getId());
+ //更新数据
+ result= updateById(entity);
+ }else{
+ result = super.save(entity);
+ }
+ return result;
- return super.save(entity);
}
}
--
Gitblit v1.9.3