diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java b/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java index 54815cad..3d7ba950 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java @@ -26,6 +26,13 @@ public enum ProcessTypeEnum { ES_ABOLISH("企标废止流程",13, "com.jero.modules.activiti.process.esAbolish.service.impl.ProcessEsAbolishServiceImpl"), ES_ARCHIVE("企标封存流程",14, "com.jero.modules.activiti.process.esArchive.service.impl.ProcessEsArchiveServiceImpl"), ES_ENABLE("已封存企标启用流程",15, "com.jero.modules.activiti.process.esEnable.service.impl.ProcessEsEnableServiceImpl"), + ES_INSPECT_PLAN("企标稽查计划", 16, "com.jero.modules.activiti.process.esinspectplan.service.impl.EsInspectPlanFlow"), + ES_INSPECT("企标稽查流程", 17, "com.jero.modules.activiti.process.esinspect.service.impl.EsInspectFlow"), + ES_INSPECT_DELAY_APPLY("稽查延期申请流程", 18, "com.jero.modules.activiti.process.esinspectdelayapply.service.impl.EsInspectDelayApplyFlowServiceImpl"), + ES_INSPECT_REPORT("企标稽查整改", 19, "com.jero.modules.activiti.process.esinspectrectify.service.impl.EsInspectRectifyFlow"), + PERMISSION_APPLY_PROCESS("权限申请流程", 20, "com.jero.modules.activiti.process.espermissionapply.service.impl.EsPermissionApplyFlow"), + STANDARD_DECLARE("标准宣贯流程", 21, "com.jero.modules.activiti.process.esdeclare.service.impl.EsDeclareFlow"), + MEETING_MANAGE("会后管理流程", 22, "com.jero.modules.activiti.process.meetingmanage.service.impl.MeetingManageFlow") ; private String name; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java index f66cbe0c..cdcfbf8a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java @@ -7,6 +7,7 @@ import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.MessageUtils; +import com.jero.common.util.SnowflakeUtils; import com.jero.modules.activiti.entity.ProcessAll; import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.enums.CommitFlagEnum; @@ -65,6 +66,11 @@ public class ProcessAspect { private static final String PROCESS_ALL = "processAll"; private static final List SPECIAL_NODE = Arrays.asList(EsInspectPlanCommon.PROCESS_NODE_3); private static final String SAVE_BY_DRAFT = "2"; + /** + * 强制撤回 + */ + private static final String REVOCATION = "3"; + // 流程发起 @Pointcut("execution(public * com.jero.modules.activiti.process..*Controller.flowStart(..))") @@ -92,7 +98,6 @@ public class ProcessAspect { } @Before("processServiceFlowApproval() || processServiceFlowReject()") - @Order(1) public void doBefore(JoinPoint jp) { log.info("==========流程合法性校验前置方法开始=========="); if (!Objects.isNull(jp.getArgs())) { @@ -120,7 +125,6 @@ public class ProcessAspect { } @Before("processServiceFlowReject()") - @Order(2) public void doBeforeCountersignReject(JoinPoint jp){ log.info("==========流程会签节点驳回一票否决前置方法开始=========="); if (!Objects.isNull(jp.getArgs())) { @@ -192,26 +196,7 @@ public class ProcessAspect { log.info("==========流程驳回，若驳回到的节点之前经过转办，则驳回到转办人手里后置方法结束=========="); } - @AfterReturning("processServiceFlowStart() || processServiceFlowApproval() || processServiceFlowReject()") - @Order(2) - public void doAfterRemoveDraft(JoinPoint jp) { - log.info("==========流程发起、审批、驳回。删除草稿后置方法开始=========="); - if (!Objects.isNull(jp.getArgs())) { - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - Map map = JSON.parseObject(JSON.toJSONString(jp.getArgs()[0]), Map.class); - Object object = map.get(PROCESS_ALL); - if (!Objects.isNull(object)){ - // 发起、审批、驳回 - ProcessAll processAll = JSON.parseObject(JSON.toJSONString(object), ProcessAll.class); - // 删除草稿 - processDraftService.remove(new LambdaQueryWrapper() - .eq(ProcessDraft::getProjectId, processAll.getProjectId()) - .eq(ProcessDraft::getUserId, loginUser.getId())); - } - } - log.info("==========流程发起、审批、驳回。删除草稿后置方法结束=========="); - } - @AfterReturning("processServiceFlowSave()") + @AfterReturning("processServiceFlowSave() || processServiceFlowStart()|| processServiceFlowStart()|| processServiceFlowStart()") public void doAfterFlowSave(JoinPoint jp) { log.info("==========流程保存到草稿后置方法开始=========="); if (!Objects.isNull(jp.getArgs())) { @@ -235,12 +220,48 @@ public class ProcessAspect { .eq(ProcessDraft::getUserId, loginUser.getId())); // 保存新草稿 processDraftService.save(processDraft); + + // 保存新草稿(强制撤回用) + processDraft.setId(String.valueOf(SnowflakeUtils.snowflake())); + processDraft.setSaveSource(REVOCATION); + processDraft.setInfoJsonStr(processDraft.getInfoJsonStr().replaceFirst("\\{", "{\"revocation\": true,")); + processDraftService.save(processDraft); + + if (jp.getSignature().getName().equals("flowStart")){ + // 发起后删除草稿 + processDraftService.remove(new LambdaQueryWrapper() + .eq(ProcessDraft::getProjectId, processAll.getProjectId()) + .eq(ProcessDraft::getUserId, loginUser.getId()) + .and(qw -> qw.ne(ProcessDraft::getSaveSource, REVOCATION) + .or().isNull(ProcessDraft::getSaveSource))); + } } } } log.info("==========流程保存到草稿后置方法结束=========="); } + @AfterReturning("processServiceFlowStart() || processServiceFlowApproval() || processServiceFlowReject()") + public void doAfterRemoveDraft(JoinPoint jp) { + log.info("==========流程发起、审批、驳回。删除草稿后置方法开始=========="); + if (!Objects.isNull(jp.getArgs())) { + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + Map map = JSON.parseObject(JSON.toJSONString(jp.getArgs()[0]), Map.class); + Object object = map.get(PROCESS_ALL); + if (!Objects.isNull(object)){ + // 发起、审批、驳回 + ProcessAll processAll = JSON.parseObject(JSON.toJSONString(object), ProcessAll.class); + // 删除草稿 + processDraftService.remove(new LambdaQueryWrapper() + .eq(ProcessDraft::getProjectId, processAll.getProjectId()) + .eq(ProcessDraft::getUserId, loginUser.getId()) + .and(qw -> qw.ne(ProcessDraft::getSaveSource, REVOCATION) + .or().isNull(ProcessDraft::getSaveSource))); + } + } + log.info("==========流程发起、审批、驳回。删除草稿后置方法结束=========="); + } + private static void setProperty(LoginUser loginUser, String infoJsonStr, ProcessApprovalRecord processApprovalRecord, ProcessAll processAll, ProcessDraft processDraft) { // 属性拷贝 BeanUtils.copyProperties(processAll, processDraft); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlow.java new file mode 100644 index 00000000..7d060eac --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlow.java @@ -0,0 +1,36 @@ +package com.jero.modules.activiti.process.esdeclare.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.modules.activiti.entity.ProcessAll; +import com.jero.modules.activiti.process.esdeclare.entity.ProcessEsDeclare; +import com.jero.modules.activiti.process.esdeclare.service.IProcessEsDeclareService; +import com.jero.modules.activiti.service.WorkCenterService; +import com.jero.modules.activiti.util.SpringContextUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * @ClassName: EsInspectPlanFlowService + * @Description: + * @Author: yjz + * @Date: 2024-01-11 21:19 + * @Version: 1.0 + **/ +@Slf4j +@Transactional(rollbackFor = RuntimeException.class) +@Service +public class EsDeclareFlow implements WorkCenterService { + /** + * 强制撤回 + * @param processAll 流程总表 + */ + @Override + public void changeToDraft(ProcessAll processAll) { + IProcessEsDeclareService processEsDeclareService = SpringContextUtil.getBean(IProcessEsDeclareService.class); + // 删除业务表数据 + processEsDeclareService.remove( + new LambdaQueryWrapper() + .eq(ProcessEsDeclare::getProjectId, processAll.getProjectId())); + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlow.java new file mode 100644 index 00000000..5bb9f7c3 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlow.java @@ -0,0 +1,36 @@ +package com.jero.modules.activiti.process.esinspect.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.modules.activiti.entity.ProcessAll; +import com.jero.modules.activiti.process.esinspect.entity.ProcessEsInspect; +import com.jero.modules.activiti.process.esinspect.service.IProcessEsInspectService; +import com.jero.modules.activiti.service.WorkCenterService; +import com.jero.modules.activiti.util.SpringContextUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * @ClassName: EsInspectPlanFlowService + * @Description: + * @Author: yjz + * @Date: 2024-01-11 21:19 + * @Version: 1.0 + **/ +@Slf4j +@Transactional(rollbackFor = RuntimeException.class) +@Service +public class EsInspectFlow implements WorkCenterService { + /** + * 强制撤回 + * @param processAll 流程总表 + */ + @Override + public void changeToDraft(ProcessAll processAll) { + IProcessEsInspectService processEsInspectService = SpringContextUtil.getBean(IProcessEsInspectService.class); + // 删除业务表数据 + processEsInspectService.remove( + new LambdaQueryWrapper() + .eq(ProcessEsInspect::getProjectId, processAll.getProjectId())); + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlow.java new file mode 100644 index 00000000..dd1e2b21 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlow.java @@ -0,0 +1,36 @@ +package com.jero.modules.activiti.process.esinspectdelayapply.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.modules.activiti.entity.ProcessAll; +import com.jero.modules.activiti.process.esinspectdelayapply.entity.ProcessEsInspectDelayApply; +import com.jero.modules.activiti.process.esinspectdelayapply.service.IProcessEsInspectDelayApplyService; +import com.jero.modules.activiti.service.WorkCenterService; +import com.jero.modules.activiti.util.SpringContextUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * @ClassName: EsInspectPlanFlowService + * @Description: + * @Author: yjz + * @Date: 2024-01-11 21:19 + * @Version: 1.0 + **/ +@Slf4j +@Transactional(rollbackFor = RuntimeException.class) +@Service +public class EsInspectDelayApplyFlow implements WorkCenterService { + /** + * 强制撤回 + * @param processAll 流程总表 + */ + @Override + public void changeToDraft(ProcessAll processAll) { + IProcessEsInspectDelayApplyService processEsInspectDelayApplyService = SpringContextUtil.getBean(IProcessEsInspectDelayApplyService.class); + // 删除业务表数据 + processEsInspectDelayApplyService.remove( + new LambdaQueryWrapper() + .eq(ProcessEsInspectDelayApply::getProjectId, processAll.getProjectId())); + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlow.java new file mode 100644 index 00000000..659914b0 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlow.java @@ -0,0 +1,36 @@ +package com.jero.modules.activiti.process.esinspectplan.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.modules.activiti.entity.ProcessAll; +import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlan; +import com.jero.modules.activiti.process.esinspectplan.service.IProcessEsInspectPlanService; +import com.jero.modules.activiti.service.WorkCenterService; +import com.jero.modules.activiti.util.SpringContextUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * @ClassName: EsInspectPlanFlowService + * @Description: + * @Author: yjz + * @Date: 2024-01-11 21:19 + * @Version: 1.0 + **/ +@Slf4j +@Transactional(rollbackFor = RuntimeException.class) +@Service +public class EsInspectPlanFlow implements WorkCenterService { + /** + * 强制撤回 + * @param processAll 流程总表 + */ + @Override + public void changeToDraft(ProcessAll processAll) { + IProcessEsInspectPlanService processEsInspectPlanService = SpringContextUtil.getBean(IProcessEsInspectPlanService.class); + // 删除业务表数据 + processEsInspectPlanService.remove( + new LambdaQueryWrapper() + .eq(ProcessEsInspectPlan::getProjectId, processAll.getProjectId())); + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlow.java new file mode 100644 index 00000000..68132197 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlow.java @@ -0,0 +1,36 @@ +package com.jero.modules.activiti.process.esinspectrectify.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.modules.activiti.entity.ProcessAll; +import com.jero.modules.activiti.process.esinspectrectify.entity.ProcessEsInspectRectify; +import com.jero.modules.activiti.process.esinspectrectify.service.IProcessEsInspectRectifyService; +import com.jero.modules.activiti.service.WorkCenterService; +import com.jero.modules.activiti.util.SpringContextUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * @ClassName: EsInspectPlanFlowService + * @Description: + * @Author: yjz + * @Date: 2024-01-11 21:19 + * @Version: 1.0 + **/ +@Slf4j +@Transactional(rollbackFor = RuntimeException.class) +@Service +public class EsInspectRectifyFlow implements WorkCenterService { + /** + * 强制撤回 + * @param processAll 流程总表 + */ + @Override + public void changeToDraft(ProcessAll processAll) { + IProcessEsInspectRectifyService processEsInspectRectifyService = SpringContextUtil.getBean(IProcessEsInspectRectifyService.class); + // 删除业务表数据 + processEsInspectRectifyService.remove( + new LambdaQueryWrapper() + .eq(ProcessEsInspectRectify::getProjectId, processAll.getProjectId())); + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlow.java new file mode 100644 index 00000000..906b1569 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlow.java @@ -0,0 +1,36 @@ +package com.jero.modules.activiti.process.espermissionapply.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.modules.activiti.entity.ProcessAll; +import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermissionApply; +import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPermissionApplyService; +import com.jero.modules.activiti.service.WorkCenterService; +import com.jero.modules.activiti.util.SpringContextUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +/** + * @ClassName: EsInspectPlanFlowService + * @Description: + * @Author: yjz + * @Date: 2024-01-11 21:19 + * @Version: 1.0 + **/ +@Slf4j +@Transactional(rollbackFor = RuntimeException.class) +@Service +public class EsPermissionApplyFlow implements WorkCenterService { + /** + * 强制撤回 + * @param processAll 流程总表 + */ + @Override + public void changeToDraft(ProcessAll processAll) { + IProcessEsPermissionApplyService processEsPermissionApplyService = SpringContextUtil.getBean(IProcessEsPermissionApplyService.class); + // 删除业务表数据 + processEsPermissionApplyService.remove( + new LambdaQueryWrapper() + .eq(ProcessEsPermissionApply::getProjectId, processAll.getProjectId())); + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbEntryChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbEntryChange.java index 734ca4ee..853c25ae 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbEntryChange.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbEntryChange.java @@ -1,25 +1,20 @@ package com.jero.modules.activiti.process.fb.entity; -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; -import java.util.Map; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Map; /** @@ -69,10 +64,18 @@ public class ProcessFbEntryChange implements Serializable { @Excel(name = "来源（1国内、2海外）", width = 15) @ApiModelProperty(value = "来源（1国内、2海外）") private java.lang.String source; + /**来源（1国内、2海外） 翻译*/ + @ApiModelProperty(value = "来源（1国内、2海外） 翻译") + @TableField(exist = false) + private java.lang.String sourceDictText; /**操作类型（1标准法规入库、2标准法规变更）*/ @Excel(name = "操作类型（1标准法规入库、2标准法规变更）", width = 15) @ApiModelProperty(value = "操作类型（1标准法规入库、2标准法规变更）") private java.lang.String operateType; + /**操作类型（1标准法规入库、2标准法规变更）*/ + @ApiModelProperty(value = "操作类型（1标准法规入库、2标准法规变更） 翻译") + @TableField(exist = false) + private java.lang.String operateTypeDictText; /**标准编号*/ @Excel(name = "标准编号", width = 15) @ApiModelProperty(value = "标准编号") 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 ba9da356..3dbfde10 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 @@ -346,6 +346,8 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl queryProcessInfoVO(String draftId, String processInstanceId, String taskId, String projectId) { ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId, taskId, projectId); ProcessFbEntryChange processFbEntryChange = getById(projectId); + // 翻译 + toDict(processFbEntryChange); Map map = JSON.parseObject(processFbEntryChange.getBusinessJson(), Map.class); // 处理字典翻译 @@ -361,6 +363,20 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl list = processMeetingManageService.list(new LambdaQueryWrapper() + .eq(ProcessMeetingManage::getProjectId, processAll.getProjectId())); + // 删除业务表数据 + processMeetingManageService.remove( + new LambdaQueryWrapper() + .eq(ProcessMeetingManage::getProjectId, processAll.getProjectId())); + + IProcessMeetingManagePersonnelService processMeetingManagePersonnelService = SpringContextUtil.getBean(IProcessMeetingManagePersonnelService.class); + + // 删除业务表数据 + List idList = list.stream().map(ProcessMeetingManage::getId).collect(Collectors.toList()); + processMeetingManagePersonnelService.remove( + new LambdaQueryWrapper() + .in(ProcessMeetingManagePersonnel::getProcessMeetingManageId, idList)); + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java index 3e4efcdd..158cc1f6 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java @@ -6,40 +6,38 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.dto.message.SendMessageDTO; +import com.jero.common.api.vo.ResultCommon; import com.jero.common.api.vo.SendMessageAPI; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; +import com.jero.modules.activiti.entity.ProcessAll; import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.enums.FinishFlagEnum; import com.jero.modules.activiti.enums.ProcessTypeEnum; +import com.jero.modules.activiti.mapper.ProcessAllMapper; import com.jero.modules.activiti.process.common.common.DraftCommon; import com.jero.modules.activiti.process.common.entity.ProcessDraft; import com.jero.modules.activiti.process.common.service.ProcessDraftService; import com.jero.modules.activiti.vo.DelegateTaskParam; import com.jero.modules.activiti.vo.ResolveTaskParam; -import com.jero.common.api.vo.ResultCommon; import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon; import com.jero.modules.laws.common.util.CurrentUserUtil; import org.activiti.engine.HistoryService; import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; -import org.activiti.engine.history.HistoricTaskInstance; -import org.activiti.engine.history.HistoricTaskInstanceQuery; import org.activiti.engine.task.Task; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.modules.activiti.mapper.ProcessAllMapper; -import com.jero.modules.activiti.entity.ProcessAll; -import org.springframework.transaction.annotation.Transactional; - /** * *@author liJiaRao @@ -102,6 +100,7 @@ public class ProcessAllService extends ServiceImpl } }catch (Exception e) { log.error(e.getMessage(),e); + throw new JeroBootException(e.getMessage()); } //修改提前储存的原始草稿状态 processDraftUpdateWrapper.eq(ProcessDraft::getProcessInstanceId, processInstanceId); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java index b5b8da89..f2dd1e84 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java @@ -107,6 +107,9 @@ public class LawsStandardizationServiceImpl extends ServiceImpl standardizationLiaisonList) { + if (standardizationLiaisonList.isEmpty()){ + return; + } // 删除旧数据 List idList = standardizationLiaisonList.stream().map(LawsStandardizationLiaison::getId).collect(Collectors.toList()); lawsStandardizationLiaisonService.remove( @@ -132,6 +135,9 @@ public class LawsStandardizationServiceImpl extends ServiceImpl standardizationMeetingList) { + if (standardizationMeetingList.isEmpty()){ + return; + } LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 删除旧数据 List idList = standardizationMeetingList.stream().map(LawsStandardizationMeeting::getId).collect(Collectors.toList()); @@ -253,6 +259,9 @@ public class LawsStandardizationServiceImpl extends ServiceImpl standardizationPaymentList) { + if (standardizationPaymentList.isEmpty()){ + return; + } // 删除旧数据 List idList = standardizationPaymentList.stream().map(LawsStandardizationPayment::getId).collect(Collectors.toList()); lawsStandardizationPaymentService.remove( @@ -300,6 +309,9 @@ public class LawsStandardizationServiceImpl extends ServiceImpl standardizationGroupList) { + if (standardizationGroupList.isEmpty()){ + return; + } // 删除旧数据 List idList = standardizationGroupList.stream().map(LawsStandardizationGroup::getId).collect(Collectors.toList()); lawsStandardizationGroupService.remove(