From b7456d8a48d98a9e320dc94f4e091ff859393fbd Mon Sep 17 00:00:00 2001 From: YBP Date: Mon, 2 Mar 2026 10:53:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=9B=9E=E8=B0=83=E5=90=8E?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=84=8F=E8=A7=81=E4=BF=AE=E6=94=B9=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1Id=E7=B1=BB=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qms/common/data/dal/dataobject/DataCommonType.java | 9 +++++++++ .../qms/common/data/service/DataOpinionService.java | 3 ++- .../qms/common/data/service/DataOpinionServiceImpl.java | 5 +++-- .../resource/device/service/DeviceApplyServiceImpl.java | 6 +++++- 4 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/dal/dataobject/DataCommonType.java diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/dal/dataobject/DataCommonType.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/dal/dataobject/DataCommonType.java new file mode 100644 index 00000000..77f736e2 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/dal/dataobject/DataCommonType.java @@ -0,0 +1,9 @@ +package com.zt.plat.module.qms.common.data.dal.dataobject; + +import lombok.Data; + +@Data +public class DataCommonType { + private Long businessId; + private String flowInstanceId; +} diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionService.java index 44408558..1b672932 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionService.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.zt.plat.module.qms.common.data.controller.vo.DataOpinionPageReqVO; import com.zt.plat.module.qms.common.data.controller.vo.DataOpinionRespVO; import com.zt.plat.module.qms.common.data.controller.vo.DataOpinionSaveReqVO; +import com.zt.plat.module.qms.common.data.dal.dataobject.DataCommonType; import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceApplyDO; import jakarta.validation.*; import com.zt.plat.module.qms.common.data.dal.dataobject.DataOpinionDO; @@ -21,7 +22,7 @@ public interface DataOpinionService { void disableOpinionsByBusId(Long busId); - void saveOpinionByWfCallback(DeviceApplyDO entity, String activityId, String activityName, JSONObject taskVariables); + void saveOpinionByWfCallback(DataCommonType entity, String activityId, String activityName, JSONObject taskVariables); List getListByBusId(Long busId); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionServiceImpl.java index 1d11b564..c76b80f0 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionServiceImpl.java @@ -11,6 +11,7 @@ import com.zt.plat.module.qms.business.config.service.ConfigUserSignatureService import com.zt.plat.module.qms.common.data.controller.vo.DataOpinionPageReqVO; import com.zt.plat.module.qms.common.data.controller.vo.DataOpinionRespVO; import com.zt.plat.module.qms.common.data.controller.vo.DataOpinionSaveReqVO; +import com.zt.plat.module.qms.common.data.dal.dataobject.DataCommonType; import com.zt.plat.module.qms.enums.QmsBpmConstant; import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceApplyDO; import org.springframework.stereotype.Service; @@ -61,7 +62,7 @@ public class DataOpinionServiceImpl implements DataOpinionService { * 流程回调后创建意见*/ @Override @Transactional(rollbackFor = Exception.class) - public void saveOpinionByWfCallback(DeviceApplyDO entity, String activityId, String activityName, JSONObject taskVariables) { + public void saveOpinionByWfCallback(DataCommonType entity, String activityId, String activityName, JSONObject taskVariables) { String opinionContent = taskVariables.getString(QmsBpmConstant.TASK_VARIABLE_REASON); LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); String userName = SecurityFrameworkUtils.getLoginUserNickname(); @@ -71,7 +72,7 @@ public class DataOpinionServiceImpl implements DataOpinionService { String deptName = loginUser.getVisitDeptName(); ConfigUserSignatureDO configUserSignatureDO = configUserSignatureService.getByUserId(userId); DataOpinionDO opinion = new DataOpinionDO(); - opinion.setBusinessId(entity.getId()); + opinion.setBusinessId(entity.getBusinessId()); opinion.setFlowInstanceId(entity.getFlowInstanceId()); opinion.setNodeKey(activityId); opinion.setNodeName(activityName); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceApplyServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceApplyServiceImpl.java index 229bab78..cb1f2d69 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceApplyServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceApplyServiceImpl.java @@ -13,6 +13,7 @@ import com.zt.plat.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import com.zt.plat.module.qms.api.task.BMPCallbackInterface; import com.zt.plat.module.qms.api.task.dto.QmsBpmDTO; import com.zt.plat.module.qms.common.data.dal.dataobject.DataCollectionDO; +import com.zt.plat.module.qms.common.data.dal.dataobject.DataCommonType; import com.zt.plat.module.qms.common.data.dal.dataobject.DataOpinionDO; import com.zt.plat.module.qms.common.data.dal.dataobject.DataTemplateDO; import com.zt.plat.module.qms.common.data.service.DataCollectionService; @@ -417,7 +418,10 @@ public class DeviceApplyServiceImpl implements DeviceApplyService, BMPCallbackIn }else if("1".equals(PROCESS_STATUS)){ //通过 // assembleSignature(currentActivityId, entity); - dataOpinionService.saveOpinionByWfCallback(entity, currentActivityId, currentActivityName, taskVariables); + DataCommonType dataCommonType = new DataCommonType(); + dataCommonType.setBusinessId(entity.getId()); + dataCommonType.setFlowInstanceId(entity.getFlowInstanceId()); + dataOpinionService.saveOpinionByWfCallback(dataCommonType, currentActivityId, currentActivityName, taskVariables); if("1".equals(firstActivityFlag)) entity.setBusinessStatus(QmsCommonConstant.IN_PROGRESS); //驳回后重新提交 if("1".equals(lastActivityFlag)){