From 24bbe7a75c85816524c097caacb141cc6846acb9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 11 十二月 2024 15:21:21 +0800
Subject: [PATCH] 增加删除取水口水量月统计年统计重复数据功能，增加删除农户用水量月统计年统计重复数据功能，
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java
index f0abe8f..5e5e66c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java
@@ -18,6 +18,7 @@
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
@@ -40,6 +41,8 @@
public class ClientCtrl {
private final ClientSv clientSv;
//private final RedisUtils redisUtils;
+ @Value("${project.projectNo}")
+ private Integer projectNo;
/**
* 鑾峰彇鍐滄埛鍒楄〃
@@ -140,9 +143,12 @@
String villageName = map_districts.get("villageName").toString();
// 鐢熸垚8浣嶈鏀垮尯鍒掔紪鐮侊紝鐢熸垚鍐滄埛缂栧彿鐢�
- String district8 = countyNum + townNum + villageNum;
+ String district8 = String.format("%02d", Integer.parseInt(countyNum)) + String.format("%03d", Integer.parseInt(townNum)) + String.format("%03d", Integer.parseInt(villageNum));
// 鐢熸垚鍐滄埛缂栧彿
String clientNum = generateClientNum(district8);
+ if(clientNum == null) {
+ return BaseResponseUtils.buildErrorMsg("鍐滄埛缂栧彿瓒呴檺");
+ }
// 鐢熸垚12浣�5绾ц鏀垮尯鍒掔紪鐮佷覆鍙婂悕绉颁覆
Long districtNum = Long.parseLong(provinceNum + cityNum + district8);
String districtTitle = countryName + townName + villageName;
@@ -195,7 +201,7 @@
Integer number = Integer.parseInt(clientNum.substring(8));
number = number + 1;
if(number > 9999) {
- return "鍐滄埛缂栧彿瓒呴檺";
+ return null;
}
clientNum = clientNum.substring(0, 8) + String.format("%04d", number);
} else {
@@ -250,7 +256,8 @@
String villageName = map_districts.get("villageName").toString();
// 鐢熸垚8浣嶈鏀垮尯鍒掔紪鐮侊紝鐢熸垚鍐滄埛缂栧彿鐢�
- String district8 = countyNum + townNum + villageNum;
+ //String district8 = countyNum + townNum + villageNum;
+ String district8 = String.format("%02d", Integer.parseInt(countyNum)) + String.format("%03d", Integer.parseInt(townNum)) + String.format("%03d", Integer.parseInt(villageNum));
// 鐢熸垚鍐滄埛缂栧彿
String clientNum = generateClientNum(district8);
// 鐢熸垚12浣�5绾ц鏀垮尯鍒掔紪鐮佷覆鍙婂悕绉颁覆
@@ -361,13 +368,13 @@
// 鐢熸垚12浣�5绾ц鏀垮尯鍒掔紪鐮佷覆鍙婂悕绉颁覆
Long districtNum = Long.parseLong(provinceNum + cityNum + countyNum + townNum + villageNum);
//鑾峰彇椤圭洰缂栫爜
- String projectNo = clientSv.getItemValue("projectNo");
- //杞负int
- Integer projectNo1 = Integer.valueOf(projectNo);
- //杞负16杩涘埗
-// String projectNo2 = Integer.toHexString(projectNo1);
-// log.info(projectNo2);
- String projectNo3 = String.format("%02x", projectNo1);
+// String projectNo = clientSv.getItemValue("projectNo");
+// //杞负int
+// Integer projectNo1 = Integer.valueOf(projectNo);
+// //杞负16杩涘埗
+//// String projectNo2 = Integer.toHexString(projectNo1);
+//// log.info(projectNo2);
+ String projectNo3 = String.format("%02x", projectNo);
log.info(projectNo3);
Map map = new HashMap();
--
Gitblit v1.8.0