From 06d79b2339046e2028bb32f72b93d729e1130523 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 05 十一月 2024 15:45:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'git-pipIrr/master'
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralCtrl.java | 13 +++++++++----
1 files changed, 9 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 da3e000..8466db3 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;
@@ -92,8 +92,9 @@
public void exportGeneral(HttpServletResponse response, QoGeneral vo) {
ExcelUtil.setExcelRespProp(response, "鎬昏处" + LocalDate.now());
List<VoGeneral> generalList = generalSv.exportGenerals(vo).getObj();
+
EasyExcel.write(response.getOutputStream(), VoGeneral.class)
- .registerWriteHandler(new ReportExportCellWriteHandler("璐㈠姟瀵硅处-鎬昏处"))
+ .registerWriteHandler(new CellWriteHandler("璐㈠姟瀵硅处-鎬昏处"))
.sheet("鎬昏处")
.doWrite(generalList);
}
@@ -211,7 +212,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);
@@ -266,8 +270,9 @@
list.add(po);
EasyExcel.write(response.getOutputStream(), VoTradeDetails.class)
- .registerWriteHandler(new ReportExportCellWriteHandler("璐㈠姟瀵硅处-浜ゆ槗鏄庣粏"))
+ .registerWriteHandler(new CellWriteHandler("璐㈠姟瀵硅处-浜ゆ槗鏄庣粏"))
.sheet("浜ゆ槗鏄庣粏")
.doWrite(list);
}
+
}
--
Gitblit v1.8.0