From a94319092857c765fdb073ad7d7df2d3e61fc49b Mon Sep 17 00:00:00 2001 From: FCL Date: Tue, 17 Mar 2026 09:41:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=8A=A5=E5=91=8AformData=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=A7=94=E6=89=98id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReportDocumentMainCorrelationService.java | 2 +- ...ReportDocumentMainCorrelationServiceImpl.java | 7 +++++-- .../service/ReportDocumentMainServiceImpl.java | 16 +++++++++++++++- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainCorrelationService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainCorrelationService.java index cdb3dff3..5fc7d96f 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainCorrelationService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainCorrelationService.java @@ -18,7 +18,7 @@ public interface ReportDocumentMainCorrelationService { public static final String CorrelationType_entrust = "entrust"; - List listByMainId(Long mainId); + List listByMainId(Long mainId, String correlationType); void deleteByMainId(Long mainId); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainCorrelationServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainCorrelationServiceImpl.java index dd0d20ee..342a814e 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainCorrelationServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainCorrelationServiceImpl.java @@ -7,6 +7,7 @@ import com.zt.plat.module.qms.business.reportdoc.controller.vo.ReportDocumentMai import com.zt.plat.module.qms.business.reportdoc.controller.vo.ReportDocumentMainCorrelationSaveReqVO; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; +import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; import java.util.*; @@ -35,10 +36,12 @@ public class ReportDocumentMainCorrelationServiceImpl implements ReportDocumentM @Override - public List listByMainId(Long mainId) { + public List listByMainId(Long mainId, String correlationType) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(ReportDocumentMainCorrelationDO::getMainId, mainId); - query.orderByAsc(ReportDocumentMainCorrelationDO::getId); + if(!ObjectUtils.isEmpty(correlationType)) + query.eq(ReportDocumentMainCorrelationDO::getCorrelationType, correlationType); + query.orderByAsc(ReportDocumentMainCorrelationDO::getCreateTime); return reportDocumentMainCorrelationMapper.selectList(query); } 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 81c2c5a7..a03fd0c6 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 @@ -303,10 +303,24 @@ public class ReportDocumentMainServiceImpl implements ReportDocumentMainService, //保存报告 @Override public void doSave(ReportDocumentMainSaveReqVO updateReqVO) { + Long id = updateReqVO.getId(); // 校验存在 - validateReportDocumentMainExists(updateReqVO.getId()); + validateReportDocumentMainExists(id); // 更新 ReportDocumentMainDO updateObj = BeanUtils.toBean(updateReqVO, ReportDocumentMainDO.class); + + //处理委托id + String formDataStr = updateReqVO.getFormData(); + if(!ObjectUtils.isEmpty(formDataStr)){ + JSONObject formData = JSONObject.parseObject(formDataStr); + List correlationList = reportDocumentMainCorrelationService.listByMainId(id, ReportDocumentMainCorrelationService.CorrelationType_entrust); + if(!correlationList.isEmpty()){ + Long entrustId = correlationList.get(0).getCorrelationId(); + if(entrustId != null) + formData.put("entrustId", entrustId.toString()); + } + updateObj.setFormData(formData.toJSONString()); + } reportDocumentMainMapper.updateById(updateObj); List reportDocumentDataList = updateReqVO.getReportDocumentDataList(); if(!reportDocumentDataList.isEmpty())