diff --git a/qc/src/public/nc/api/qc/resource/QcconclusionRestResource.java b/qc/src/public/nc/api/qc/resource/QcconclusionRestResource.java index ab0420d4..1d5d51ac 100644 --- a/qc/src/public/nc/api/qc/resource/QcconclusionRestResource.java +++ b/qc/src/public/nc/api/qc/resource/QcconclusionRestResource.java @@ -9,6 +9,7 @@ import nc.vo.pub.BusinessException; import nc.vo.pub.VOStatus; import nc.vo.pub.lang.UFBoolean; import nc.vo.pub.lang.UFDouble; +import nc.vo.pubapp.pflow.PfUserObject; import nc.vo.qc.c003.entity.ReportHeaderVO; import nc.vo.qc.c003.entity.ReportItemVO; import nc.vo.qc.c003.entity.ReportVO; @@ -17,9 +18,11 @@ import nc.vo.util.CloneUtil; import nccloud.api.rest.utils.NCCRestUtils; import nccloud.api.rest.utils.ResultMessageUtil; import nccloud.dto.scmpub.script.entity.SCMScriptResultDTO; +import nccloud.framework.service.ServiceLocator; import nccloud.pubitf.riart.pflow.CloudPFlowContext; import nccloud.pubitf.scmpub.commit.service.IBatchRunScriptService; import nccloud.pubitf.scmpub.pub.service.ISCMPubQueryService; +import nccloud.pubitf.scmpub.pub.service.ISCMPubSaveCommitService; import org.json.JSONString; import javax.ws.rs.Consumes; @@ -241,8 +244,12 @@ public class QcconclusionRestResource extends QcBaseRestResource { } } IReportMaintain reportMaintain = NCLocator.getInstance().lookup(IReportMaintain.class); + ISCMPubSaveCommitService service = NCLocator.getInstance().lookup(ISCMPubSaveCommitService.class);; + try { - resultVos = reportMaintain.saveBase(vos, new Object(), updatevos); + SCMScriptResultDTO obj = service.saveCommit(vos, (PfUserObject)null, ReportVO.class, "SAVEBASE", "SAVE", QCBillType.ReportBill.getCode()); + resultVos = (ReportVO[]) obj.getSucessVOs(); + // resultVos = reportMaintain.saveBase(vos, new Object(), updatevos); } catch (BusinessException e) { return ResultMessageUtil.exceptionToJSON(e); } @@ -254,16 +261,18 @@ public class QcconclusionRestResource extends QcBaseRestResource { int num = dao.executeUpdate(updateSql); } resultVos = NCLocator.getInstance().lookup(ISCMPubQueryService.class).billquery(ReportVO.class, idArr); - } - // 审批 - String actionName = "SAVE"; - if ("N".equals(flag)) { - actionName = "UNSAVE"; - } - CloudPFlowContext context = this.generatePFContext(resultVos, actionName); - IBatchRunScriptService iReportApprove = NCLocator.getInstance().lookup(IBatchRunScriptService.class); + // 弃审 + String actionName = "SAVE"; + if ("N".equals(flag)) { + actionName = "UNSAVE"; + } + CloudPFlowContext context = this.generatePFContext(resultVos, actionName); + IBatchRunScriptService iReportApprove = NCLocator.getInstance().lookup(IBatchRunScriptService.class); + + SCMScriptResultDTO obj = iReportApprove.runBacth(context, ReportVO.class); + resultVos=(ReportVO[]) obj.getSucessVOs(); + } - SCMScriptResultDTO obj = iReportApprove.runBacth(context, ReportVO.class); // 质检报告更新 Map returnMap = new HashMap<>();