From 25293493990b50403f85d9d0be30f3b46eda2366 Mon Sep 17 00:00:00 2001 From: FCL Date: Tue, 28 Oct 2025 16:56:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=8A=A5=E5=91=8A=E7=BC=96=E5=88=B6-?= =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/ReportDocumentMainController.java | 2 +- .../reportdoc/service/ReportDocumentDataServiceImpl.java | 4 ++-- .../reportdoc/service/ReportDocumentMainServiceImpl.java | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentMainController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentMainController.java index 9540863..7a6c06c 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentMainController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentMainController.java @@ -108,7 +108,7 @@ public class ReportDocumentMainController extends AbstractFileUploadController i //@PreAuthorize("@ss.hasPermission('qms:report-document-main:update')") public CommonResult doSave(@Valid @RequestBody ReportDocumentMainSaveReqVO updateReqVO) { updateReqVO.setCancelFlag("0"); - reportDocumentMainService.updateReportDocumentMain(updateReqVO); + reportDocumentMainService.doSave(updateReqVO); return success(true); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java index 468de54..74bdcf2 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java @@ -141,7 +141,7 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService //处理表头 JSONObject t = new JSONObject(); int rowAssist = 1; - int colIndex = 1; + int colIndex = fixedColCount + 1; boolean lastObjFlag = true; if("1".equals(hasRemark)){ //在最后一列增加备注 @@ -164,7 +164,7 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService t.put(colPrefix + parseNumToString(colCountOneSample + 1, 2), "备注"); } rowAssist++; - colIndex = fixedColCount; //第二组以后，从固定列数开始 + colIndex = fixedColCount + 1; //第二组以后，从固定列数开始 lastObjFlag = false; } colIndex++; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java index 3f03763..18f57c4 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java @@ -185,7 +185,8 @@ public class ReportDocumentMainServiceImpl implements ReportDocumentMainService, ReportDocumentMainDO updateObj = BeanUtils.toBean(updateReqVO, ReportDocumentMainDO.class); reportDocumentMainMapper.updateById(updateObj); List reportDocumentDataList = updateReqVO.getReportDocumentDataList(); - reportDocumentDataService.updateBatch(reportDocumentDataList); + if(!reportDocumentDataList.isEmpty()) + reportDocumentDataService.updateBatch(reportDocumentDataList); } @Override