add 标准法规入库/变更流程-流程结束后入库

This commit is contained in:
liao
2023-11-08 13:52:54 +08:00
parent efa8c06409
commit ae07baaba1
4 changed files with 39 additions and 2 deletions
@@ -78,4 +78,11 @@ public interface IProcessHandleService {
* @Description: 查询流程信息 * @Description: 查询流程信息
**/ **/
ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId); ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId);
/**
* @Author: liao
* @Date: 2023/11/8 13:36
* @Description: 判断流程是否结束
**/
Boolean isProcessFinish(String processInstanceId);
} }
@@ -8,12 +8,12 @@ import com.jero.modules.activiti.process.fb.entity.ProcessFbEntryChange;
import com.jero.modules.activiti.process.fb.mapper.ProcessFbEntryChangeMapper; import com.jero.modules.activiti.process.fb.mapper.ProcessFbEntryChangeMapper;
import com.jero.modules.activiti.process.fb.service.IProcessFbEntryChangeService; import com.jero.modules.activiti.process.fb.service.IProcessFbEntryChangeService;
import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
import com.jero.modules.activiti.process.fb.util.ObjectToMapUtil;
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.constant.FieldCommon;
import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.common.constant.ResultCommon;
import com.jero.modules.laws.common.service.ILawsCommonService; import com.jero.modules.laws.common.service.ILawsCommonService;
import com.jero.modules.laws.common.util.CurrentUserUtil; import com.jero.modules.laws.common.util.CurrentUserUtil;
import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFile;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -114,6 +114,20 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
processInfoVO.setBusinessId(businessInfoDTO.getId()); processInfoVO.setBusinessId(businessInfoDTO.getId());
editBusinessInfo(businessInfoDTO); editBusinessInfo(businessInfoDTO);
processHandleService.approveTask(processInfoVO, pass); processHandleService.approveTask(processInfoVO, pass);
String processInstanceId = processInfoVO.getBasicProcessInfoDTO().getProcessInstanceId();
// 如果流程结束
if (pass && processHandleService.isProcessFinish(processInstanceId)) {
Map<String, Object> objectMap = ObjectToMapUtil.transform(businessInfoDTO);
objectMap.put(FieldCommon.MODULE, businessInfoDTO.getSource());
if ("1".equals(businessInfoDTO.getOperateType())) {
// 如果是标准法规入库流程
lawsCommonService.commonAdd(objectMap);
} else {
// 如果是标准法规变更流程
lawsCommonService.commonEdit(objectMap);
}
}
} }
/** /**
@@ -304,4 +304,20 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
return processInfoVO; return processInfoVO;
} }
/**
* @Author: liao
* @Date: 2023/11/8 13:37
* @Description: 判断流程是否结束
**/
@Override
public Boolean isProcessFinish(String processInstanceId) {
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
.processInstanceId(processInstanceId)
.singleResult();
if (processInstance == null) {
return true;
}
return false;
}
} }
@@ -23,7 +23,7 @@ public class ObjectToMapUtil {
* 驼峰规范属性转下划线 * 驼峰规范属性转下划线
* 支持递归转换,如属性为JavaBean时 * 支持递归转换,如属性为JavaBean时
*/ */
public static<T> Map transform(T object){ public static<T> Map<String, Object> transform(T object){
if(object == null){ if(object == null){
return null; return null;
} }