ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(稽查流程): 强制撤销

Browse Source
This commit is contained in:
yjz
2024-01-11 23:37:57 +08:00
parent 52ab19a416
commit e94dc823ef
13 changed files with 366 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java
+7
View File
@@ -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;
laws-modules/src/main/java/com/jero/modules/activiti/process/aspect/ProcessAspect.java
+43 -22
View File
@@ -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<String> 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<String, Objects> 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<ProcessDraft>()
.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<ProcessDraft>()
.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<String, Objects> 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<ProcessDraft>()
.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);
laws-modules/src/main/java/com/jero/modules/activiti/process/esdeclare/service/impl/EsDeclareFlow.java
+36
View File
@@ -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<ProcessEsDeclare>()
.eq(ProcessEsDeclare::getProjectId, processAll.getProjectId()));
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlow.java
+36
View File
@@ -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<ProcessEsInspect>()
.eq(ProcessEsInspect::getProjectId, processAll.getProjectId()));
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectdelayapply/service/impl/EsInspectDelayApplyFlow.java
+36
View File
@@ -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<ProcessEsInspectDelayApply>()
.eq(ProcessEsInspectDelayApply::getProjectId, processAll.getProjectId()));
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlow.java
+36
View File
@@ -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<ProcessEsInspectPlan>()
.eq(ProcessEsInspectPlan::getProjectId, processAll.getProjectId()));
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectrectify/service/impl/EsInspectRectifyFlow.java
+36
View File
@@ -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<ProcessEsInspectRectify>()
.eq(ProcessEsInspectRectify::getProjectId, processAll.getProjectId()));
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/EsPermissionApplyFlow.java
+36
View File
@@ -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<ProcessEsPermissionApply>()
.eq(ProcessEsPermissionApply::getProjectId, processAll.getProjectId()));
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbEntryChange.java
+14 -11
View File
@@ -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 = "标准编号")
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
+16
View File
@@ -346,6 +346,8 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
public ProcessInfoVO<ProcessFbEntryChange> queryProcessInfoVO(String draftId, String processInstanceId, String taskId, String projectId) {
ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId, taskId, projectId);
ProcessFbEntryChange processFbEntryChange = getById(projectId);
// 翻译
toDict(processFbEntryChange);
Map<String, Object> map = JSON.parseObject(processFbEntryChange.getBusinessJson(), Map.class);
// 处理字典翻译
@@ -361,6 +363,20 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
return processInfoVO;
}
private void toDict(ProcessFbEntryChange processFbEntryChange) {
String source = processFbEntryChange.getSource();
if ("1".equals(source)){
processFbEntryChange.setSourceDictText("国内");
}else {
processFbEntryChange.setSourceDictText("海外");
}
if ("1".equals(processFbEntryChange.getOperateType())){
processFbEntryChange.setOperateTypeDictText("标准法规入库");
}else {
processFbEntryChange.setOperateTypeDictText("标准法规变更");
}
}
@Override
public void changeToDraft(ProcessAll processAll) {
// 删除自己的草稿
laws-modules/src/main/java/com/jero/modules/activiti/process/meetingmanage/service/impl/MeetingManageFlow.java
+51
View File
@@ -0,0 +1,51 @@
package com.jero.modules.activiti.process.meetingmanage.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.modules.activiti.entity.ProcessAll;
import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingManage;
import com.jero.modules.activiti.process.meetingmanage.entity.ProcessMeetingManagePersonnel;
import com.jero.modules.activiti.process.meetingmanage.service.IProcessMeetingManagePersonnelService;
import com.jero.modules.activiti.process.meetingmanage.service.IProcessMeetingManageService;
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;
import java.util.List;
import java.util.stream.Collectors;
/**
* @ClassName: EsInspectPlanFlowService
* @Description:
* @Author: yjz
* @Date: 2024-01-11 21:19
* @Version: 1.0
**/
@Slf4j
@Transactional(rollbackFor = RuntimeException.class)
@Service
public class MeetingManageFlow implements WorkCenterService {
/**
* 强制撤回
* @param processAll 流程总表
*/
@Override
public void changeToDraft(ProcessAll processAll) {
IProcessMeetingManageService processMeetingManageService = SpringContextUtil.getBean(IProcessMeetingManageService.class);
List<ProcessMeetingManage> list = processMeetingManageService.list(new LambdaQueryWrapper<ProcessMeetingManage>()
.eq(ProcessMeetingManage::getProjectId, processAll.getProjectId()));
// 删除业务表数据
processMeetingManageService.remove(
new LambdaQueryWrapper<ProcessMeetingManage>()
.eq(ProcessMeetingManage::getProjectId, processAll.getProjectId()));
IProcessMeetingManagePersonnelService processMeetingManagePersonnelService = SpringContextUtil.getBean(IProcessMeetingManagePersonnelService.class);
// 删除业务表数据
List<String> idList = list.stream().map(ProcessMeetingManage::getId).collect(Collectors.toList());
processMeetingManagePersonnelService.remove(
new LambdaQueryWrapper<ProcessMeetingManagePersonnel>()
.in(ProcessMeetingManagePersonnel::getProcessMeetingManageId, idList));
}
}
laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
+7 -8
View File
@@ -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<ProcessAllMapper, ProcessAll>
}
}catch (Exception e) {
log.error(e.getMessage(),e);
throw new JeroBootException(e.getMessage());
}
//修改提前储存的原始草稿状态
processDraftUpdateWrapper.eq(ProcessDraft::getProcessInstanceId, processInstanceId);
laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
+12
View File
@@ -107,6 +107,9 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
}
private void saveOrUpdateLiaison(LawsStandardization lawsStandardization, List<LawsStandardizationLiaison> standardizationLiaisonList) {
if (standardizationLiaisonList.isEmpty()){
return;
}
// 删除旧数据
List<String> idList = standardizationLiaisonList.stream().map(LawsStandardizationLiaison::getId).collect(Collectors.toList());
lawsStandardizationLiaisonService.remove(
@@ -132,6 +135,9 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
* @param standardizationMeetingList 标准化-参会记录
*/
private void saveOrUpdateMeeting(LawsStandardization lawsStandardization, List<LawsStandardizationMeeting> standardizationMeetingList) {
if (standardizationMeetingList.isEmpty()){
return;
}
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// 删除旧数据
List<String> idList = standardizationMeetingList.stream().map(LawsStandardizationMeeting::getId).collect(Collectors.toList());
@@ -253,6 +259,9 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
* @param standardizationPaymentList 支付信息列表
*/
private void saveOrUpdatePayment(LawsStandardization lawsStandardization, List<LawsStandardizationPayment> standardizationPaymentList) {
if (standardizationPaymentList.isEmpty()){
return;
}
// 删除旧数据
List<String> idList = standardizationPaymentList.stream().map(LawsStandardizationPayment::getId).collect(Collectors.toList());
lawsStandardizationPaymentService.remove(
@@ -300,6 +309,9 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
* @param standardizationGroupList 集团参与情况列表
*/
private void saveOrUpdateGroup(LawsStandardization lawsStandardization, List<LawsStandardizationGroup> standardizationGroupList) {
if (standardizationGroupList.isEmpty()){
return;
}
// 删除旧数据
List<String> idList = standardizationGroupList.stream().map(LawsStandardizationGroup::getId).collect(Collectors.toList());
lawsStandardizationGroupService.remove(