From bdd5636a47f5096fc4415b3f97077b88dcc24a1d Mon Sep 17 00:00:00 2001 From: FCL Date: Tue, 21 Oct 2025 08:37:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=94=99=E8=AF=AF=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/ReportDocumentMainController.java | 75 +++++++++---------- 1 file changed, 37 insertions(+), 38 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 de05c94..bf2971f 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 @@ -91,44 +91,43 @@ public class ReportDocumentMainController extends AbstractFileUploadController i return success(reportDocumentMainService.createReportDocumentMain(vo)); } - @Resource private BpmProcessInstanceApi bpmProcessInstanceApi; - - @Override - @Transactional(rollbackFor = Exception.class) - public CommonResult createProcessInstance(ReportDocumentMainSaveReqVO entity) { - LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); - Long id = entity.getId(); - DataFormDO dataForm = getDataForm(id); - Long dataCollectionId = dataForm.getDataCollectionId(); - DataCollectionDO dataCollection = dataCollectionService.getDataCollection(dataCollectionId); - if(dataCollection == null) - throw exception(ErrorCodeConstants.DATA_FORM_EMPTY_COLLECTION_ID); - if(ObjectUtils.isEmpty(dataCollection.getFlowKey())) - throw exception(ErrorCodeConstants.DATA_COLLECTION_EMPTY_WF_KEY); - JSONObject formData = new JSONObject(); - if(dataForm.getFormData() != null) - formData = JSONObject.parseObject(dataForm.getFormData()); - formData.put("mainId", id); - formData.put("applyUser", dataForm.getApplyUser()); - formData.put("applyUserId", dataForm.getApplyUserId()); - formData.put("applyDepartment", dataForm.getApplyDepartment()); - formData.put("applyDepartmentId", dataForm.getApplyDepartmentId()); - formData.put("applyTime", dataForm.getApplyTime()); - Map variables = formData.toJavaObject(Map.class); - variables.put(BPM_CALLBACK_BEAN_NAME, "dataFormService"); - BpmProcessInstanceCreateReqDTO reqDTO = new BpmProcessInstanceCreateReqDTO(); - reqDTO.setBusinessKey(String.valueOf(id)); - reqDTO.setProcessDefinitionKey(dataCollection.getFlowKey()); - reqDTO.setVariables(variables); - CommonResult result = bpmProcessInstanceApi.createProcessInstance(loginUser.getId(), reqDTO); - if(!result.isSuccess()){ - throw exception0(ERROR_CODE_MODULE_COMMON, result.getMsg()); - } - String wfInsId = result.getData(); - dataForm.setFlowInstanceId(wfInsId); - dataFormMapper.updateById(dataForm); - return BeanUtils.toBean(dataForm, DataFormRespVO.class); - } +// @Resource private BpmProcessInstanceApi bpmProcessInstanceApi; +// @Override +// @Transactional(rollbackFor = Exception.class) +// public CommonResult createProcessInstance(ReportDocumentMainSaveReqVO entity) { +// LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); +// Long id = entity.getId(); +// DataFormDO dataForm = getDataForm(id); +// Long dataCollectionId = dataForm.getDataCollectionId(); +// DataCollectionDO dataCollection = dataCollectionService.getDataCollection(dataCollectionId); +// if(dataCollection == null) +// throw exception(ErrorCodeConstants.DATA_FORM_EMPTY_COLLECTION_ID); +// if(ObjectUtils.isEmpty(dataCollection.getFlowKey())) +// throw exception(ErrorCodeConstants.DATA_COLLECTION_EMPTY_WF_KEY); +// JSONObject formData = new JSONObject(); +// if(dataForm.getFormData() != null) +// formData = JSONObject.parseObject(dataForm.getFormData()); +// formData.put("mainId", id); +// formData.put("applyUser", dataForm.getApplyUser()); +// formData.put("applyUserId", dataForm.getApplyUserId()); +// formData.put("applyDepartment", dataForm.getApplyDepartment()); +// formData.put("applyDepartmentId", dataForm.getApplyDepartmentId()); +// formData.put("applyTime", dataForm.getApplyTime()); +// Map variables = formData.toJavaObject(Map.class); +// variables.put(BPM_CALLBACK_BEAN_NAME, "dataFormService"); +// BpmProcessInstanceCreateReqDTO reqDTO = new BpmProcessInstanceCreateReqDTO(); +// reqDTO.setBusinessKey(String.valueOf(id)); +// reqDTO.setProcessDefinitionKey(dataCollection.getFlowKey()); +// reqDTO.setVariables(variables); +// CommonResult result = bpmProcessInstanceApi.createProcessInstance(loginUser.getId(), reqDTO); +// if(!result.isSuccess()){ +// throw exception0(ERROR_CODE_MODULE_COMMON, result.getMsg()); +// } +// String wfInsId = result.getData(); +// dataForm.setFlowInstanceId(wfInsId); +// dataFormMapper.updateById(dataForm); +// return BeanUtils.toBean(dataForm, DataFormRespVO.class); +// } @PostMapping("/execAddData")