zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:报告编制-细节调整

Browse Source
This commit is contained in:
FCL
2025-10-28 16:56:52 +08:00
parent ec3e594951
commit 2529349399
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentMainController.java
View File

@@ -108,7 +108,7 @@ public class ReportDocumentMainController extends AbstractFileUploadController i
//@PreAuthorize("@ss.hasPermission('qms:report-document-main:update')") //@PreAuthorize("@ss.hasPermission('qms:report-document-main:update')")
public CommonResult<Boolean> doSave(@Valid @RequestBody ReportDocumentMainSaveReqVO updateReqVO) { public CommonResult<Boolean> doSave(@Valid @RequestBody ReportDocumentMainSaveReqVO updateReqVO) {
updateReqVO.setCancelFlag("0"); updateReqVO.setCancelFlag("0");
reportDocumentMainService.updateReportDocumentMain(updateReqVO); reportDocumentMainService.doSave(updateReqVO);
return success(true); return success(true);
} }

4
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java
View File

@@ -141,7 +141,7 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService
//处理表头 //处理表头
JSONObject t = new JSONObject(); JSONObject t = new JSONObject();
int rowAssist = 1; int rowAssist = 1;
int colIndex = 1; int colIndex = fixedColCount + 1;
boolean lastObjFlag = true; boolean lastObjFlag = true;
if("1".equals(hasRemark)){ if("1".equals(hasRemark)){
//在最后一列增加备注 //在最后一列增加备注
@@ -164,7 +164,7 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService
t.put(colPrefix + parseNumToString(colCountOneSample + 1, 2), "备注"); t.put(colPrefix + parseNumToString(colCountOneSample + 1, 2), "备注");
} }
rowAssist++; rowAssist++;
colIndex = fixedColCount; //第二组以后，从固定列数开始 colIndex = fixedColCount + 1; //第二组以后，从固定列数开始
lastObjFlag = false; lastObjFlag = false;
} }
colIndex++; colIndex++;

3
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java
View File

@@ -185,7 +185,8 @@ public class ReportDocumentMainServiceImpl implements ReportDocumentMainService,
ReportDocumentMainDO updateObj = BeanUtils.toBean(updateReqVO, ReportDocumentMainDO.class); ReportDocumentMainDO updateObj = BeanUtils.toBean(updateReqVO, ReportDocumentMainDO.class);
reportDocumentMainMapper.updateById(updateObj); reportDocumentMainMapper.updateById(updateObj);
List<ReportDocumentDataSaveReqVO> reportDocumentDataList = updateReqVO.getReportDocumentDataList(); List<ReportDocumentDataSaveReqVO> reportDocumentDataList = updateReqVO.getReportDocumentDataList();
reportDocumentDataService.updateBatch(reportDocumentDataList); if(!reportDocumentDataList.isEmpty())
reportDocumentDataService.updateBatch(reportDocumentDataList);
} }
@Override @Override