diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java index 1966bbc3..ef7d7c4f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java @@ -78,4 +78,11 @@ public interface IProcessHandleService { * @Description: 查询流程信息 **/ ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId); + + /** + * @Author: liao + * @Date: 2023/11/8 13:36 + * @Description: 判断流程是否结束 + **/ + Boolean isProcessFinish(String processInstanceId); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java index 6fc8cb4e..8611deb3 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java @@ -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.service.IProcessFbEntryChangeService; 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.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.common.service.ILawsCommonService; import com.jero.modules.laws.common.util.CurrentUserUtil; -import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFile; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -114,6 +114,20 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl objectMap = ObjectToMapUtil.transform(businessInfoDTO); + objectMap.put(FieldCommon.MODULE, businessInfoDTO.getSource()); + if ("1".equals(businessInfoDTO.getOperateType())) { + // 如果是标准法规入库流程 + lawsCommonService.commonAdd(objectMap); + } else { + // 如果是标准法规变更流程 + lawsCommonService.commonEdit(objectMap); + } + } } /** diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java index 908cb67b..a7c030ac 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java @@ -304,4 +304,20 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { 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; + } + } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/util/ObjectToMapUtil.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/util/ObjectToMapUtil.java index af2400db..cf25f86f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/util/ObjectToMapUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/util/ObjectToMapUtil.java @@ -23,7 +23,7 @@ public class ObjectToMapUtil { * 驼峰规范属性转下划线 * 支持递归转换,如属性为JavaBean时 */ - public static Map transform(T object){ + public static Map transform(T object){ if(object == null){ return null; }