From 77547e85cac1f2e9a02e770fb8dfb603d236c67a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 11 十二月 2024 11:50:36 +0800
Subject: [PATCH] 1、取水口年月水量统计、农户年月用水量统计、取水口漏损年月统计存在bug，进行了修改； 2、生成新的pipIrr-web-temp临时任务模块，执行一些临时任务，例如删除数据库中一些出错的数据。
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralCtrl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralCtrl.java
index 1dc16a5..1a4f417 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralCtrl.java
@@ -6,8 +6,8 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
+import com.dy.pipIrrGlobal.excel.CellWriteHandler;
import com.dy.pipIrrGlobal.excel.ExcelUtil;
-import com.dy.pipIrrGlobal.excel.ReportExportCellWriteHandler;
import com.dy.pipIrrGlobal.pojoBa.BaClient;
import com.dy.pipIrrGlobal.pojoSe.SeAudits;
import com.dy.pipIrrGlobal.pojoSe.SeGeneral;
@@ -94,7 +94,7 @@
List<VoGeneral> generalList = generalSv.exportGenerals(vo).getObj();
EasyExcel.write(response.getOutputStream(), VoGeneral.class)
- .registerWriteHandler(new ReportExportCellWriteHandler("璐㈠姟瀵硅处-鎬昏处"))
+ .registerWriteHandler(new CellWriteHandler("璐㈠姟瀵硅处-鎬昏处"))
.sheet("鎬昏处")
.doWrite(generalList);
}
@@ -106,6 +106,8 @@
* @return
*/
public void add_general(){
+ //鍒犻櫎浠婂ぉ鐨勬�昏处
+ generalSv.deleteTodayGeneral();
// 鑾峰彇鏈敓鎴愭�昏处鐨勪氦鏄撴棩鏈熷垪琛紙褰撳ぉ鐨勪氦鏄撹褰曚笉鐢熸垚鎬昏处锛�
List<Map<String, Object>> list_operateDate = Optional.ofNullable(generalSv.getDatesOfNotInGenerals()).orElse(new ArrayList<>());
if(list_operateDate.size() > 0) {
@@ -212,7 +214,10 @@
})
@GetMapping(path = "getSummaries")
@SsoAop()
- public BaseResponse<Map> getSummaries(QoSummary vo){
+ public BaseResponse<Map> getSummaries( @Valid QoSummary vo, BindingResult bindingResult){
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
try {
Map res = generalSv.getSummaries(vo);
return BaseResponseUtils.buildSuccess(res);
@@ -267,8 +272,9 @@
list.add(po);
EasyExcel.write(response.getOutputStream(), VoTradeDetails.class)
- .registerWriteHandler(new ReportExportCellWriteHandler("璐㈠姟瀵硅处-浜ゆ槗鏄庣粏"))
+ .registerWriteHandler(new CellWriteHandler("璐㈠姟瀵硅处-浜ゆ槗鏄庣粏"))
.sheet("浜ゆ槗鏄庣粏")
.doWrite(list);
}
+
}
--
Gitblit v1.8.0