From add51f9302430d60680ba0f6c2c494e141e40b80 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 04 Nov 2023 18:45:13 +0800
Subject: [PATCH] 人工上报处理

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DbReportServiceImpl.java |   20 +++++++++++++++++---
 1 files changed, 17 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..0b2885d 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,14 +23,20 @@
 
 		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")){
-
+//			if (dbReport.getType().equals("wy")){
+//				//位移
+//				list =  baseMapper.getYearListWy(dbReport);
+//			}else{
+//				list =  baseMapper.getYearList(dbReport);
+//			}
 		}
 		return list;
 
@@ -41,7 +47,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