zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

流程回调后创建意见修改业务Id类名称

Browse Source
This commit is contained in:
YBP
2026-03-02 10:53:52 +08:00
parent 8f1c72ed29
commit b7456d8a48
4 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/dal/dataobject/DataCommonType.java Normal file
View File

@@ -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;
}

3
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionService.java
View File

@@ -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<DataOpinionDO> getListByBusId(Long busId);

5
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionServiceImpl.java
View File

@@ -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);

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceApplyServiceImpl.java
View File

@@ -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)){