yonyou
/
taikai2312
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改为保存提交

This commit is contained in:
lihao 2025-10-26 18:17:57 +08:00
parent 9098a9b428
commit b09d397893
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
qc/src/public/nc/api/qc/resource/QcconclusionRestResource.java
View File

@ -9,6 +9,7 @@ import nc.vo.pub.BusinessException;
import nc.vo.pub.VOStatus; import nc.vo.pub.VOStatus;
import nc.vo.pub.lang.UFBoolean; import nc.vo.pub.lang.UFBoolean;
import nc.vo.pub.lang.UFDouble; 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.ReportHeaderVO;
import nc.vo.qc.c003.entity.ReportItemVO; import nc.vo.qc.c003.entity.ReportItemVO;
import nc.vo.qc.c003.entity.ReportVO; 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.NCCRestUtils;
import nccloud.api.rest.utils.ResultMessageUtil; import nccloud.api.rest.utils.ResultMessageUtil;
import nccloud.dto.scmpub.script.entity.SCMScriptResultDTO; import nccloud.dto.scmpub.script.entity.SCMScriptResultDTO;
import nccloud.framework.service.ServiceLocator;
import nccloud.pubitf.riart.pflow.CloudPFlowContext; import nccloud.pubitf.riart.pflow.CloudPFlowContext;
import nccloud.pubitf.scmpub.commit.service.IBatchRunScriptService; import nccloud.pubitf.scmpub.commit.service.IBatchRunScriptService;
import nccloud.pubitf.scmpub.pub.service.ISCMPubQueryService; import nccloud.pubitf.scmpub.pub.service.ISCMPubQueryService;
import nccloud.pubitf.scmpub.pub.service.ISCMPubSaveCommitService;
import org.json.JSONString; import org.json.JSONString;
import javax.ws.rs.Consumes; import javax.ws.rs.Consumes;
@ -241,8 +244,12 @@ public class QcconclusionRestResource extends QcBaseRestResource {
} }
} }
IReportMaintain reportMaintain = NCLocator.getInstance().lookup(IReportMaintain.class); IReportMaintain reportMaintain = NCLocator.getInstance().lookup(IReportMaintain.class);
ISCMPubSaveCommitService service = NCLocator.getInstance().lookup(ISCMPubSaveCommitService.class);;
try { 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) { } catch (BusinessException e) {
return ResultMessageUtil.exceptionToJSON(e); return ResultMessageUtil.exceptionToJSON(e);
} }
@ -254,16 +261,18 @@ public class QcconclusionRestResource extends QcBaseRestResource {
int num = dao.executeUpdate(updateSql); int num = dao.executeUpdate(updateSql);
} }
resultVos = NCLocator.getInstance().lookup(ISCMPubQueryService.class).billquery(ReportVO.class, idArr); resultVos = NCLocator.getInstance().lookup(ISCMPubQueryService.class).billquery(ReportVO.class, idArr);
} // 弃审
// 审批 String actionName = "SAVE";
String actionName = "SAVE"; if ("N".equals(flag)) {
if ("N".equals(flag)) { actionName = "UNSAVE";
actionName = "UNSAVE"; }
} CloudPFlowContext context = this.generatePFContext(resultVos, actionName);
CloudPFlowContext context = this.generatePFContext(resultVos, actionName); IBatchRunScriptService iReportApprove = NCLocator.getInstance().lookup(IBatchRunScriptService.class);
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<String, Object> returnMap = new HashMap<>(); Map<String, Object> returnMap = new HashMap<>();