diff --git a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TtReportManageActDao.java b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TtReportManageActDao.java index 7965ce7..931ccdb 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TtReportManageActDao.java +++ b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TtReportManageActDao.java @@ -44,7 +44,7 @@ public interface TtReportManageActDao extends BaseMapper { */ List queryList(@Param("pageVO") TtReportManageActPageVO ttReportManageActPageVO); - TtReportManageAct selectByDataId(String dataId); + List selectByDataId(String dataId); TtReportManageAct selectByPrcId(String prcId); } diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml index b98ee31..996259e 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml @@ -114,7 +114,7 @@ downloadCount.download AS download, AVG( trur.user_rating ) AS reportRating, IF(bpn.id is null,1, - IF(bpn.end_time is null,0,1) + IF(bpn.SUBMIT_STATUS = 1,0,1) ) as isAct FROM TT_REPORT_MANAGE eo @@ -186,7 +186,7 @@ t.confidentialLevel, t.privacyLevel, IF(bpn.id is null,1, - IF(bpn.end_time is null,0,1) + IF(bpn.SUBMIT_STATUS = 1,0,1) ) as isAct FROM `tt_report_manage` AS t LEFT JOIN bus_process_name as bpn on bpn.data_id = t.id and bpn.prc_type = '5' diff --git a/adc-da-report/target/classes/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.class b/adc-da-report/target/classes/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.class index 019ce74..2f12835 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.class and b/adc-da-report/target/classes/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.class differ diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java index 77ad726..430cf3d 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java @@ -226,14 +226,20 @@ public class TodoTaskController { reportEntity = reportDao.selectById(dataId); }else if("4".equals(prcType)){ //上传 - TtReportManageAct ttReportManageAct = ttReportManageActDao.selectByDataId(dataId); - reportEntity.setConfidentialLevel(ttReportManageAct.getConfidentialLevel()); - reportEntity.setPrivacyLevel(ttReportManageAct.getPrivacyLevel()); + List ttReportManageActList = ttReportManageActDao.selectByDataId(dataId); + if (CollectionUtils.isNotEmpty(ttReportManageActList)){ + TtReportManageAct ttReportManageAct = ttReportManageActList.get(0); + reportEntity.setConfidentialLevel(ttReportManageAct.getConfidentialLevel()); + reportEntity.setPrivacyLevel(ttReportManageAct.getPrivacyLevel()); + } }else if("5".equals(prcType)){ - //上传 - TtReportManageAct ttReportManageAct = ttReportManageActDao.selectByDataId(dataId); - reportEntity.setConfidentialLevel(ttReportManageAct.getConfidentialLevel()); - reportEntity.setPrivacyLevel(ttReportManageAct.getPrivacyLevel()); + // 编辑 + List ttReportManageActList = ttReportManageActDao.selectByDataId(dataId); + if (CollectionUtils.isNotEmpty(ttReportManageActList)){ + TtReportManageAct ttReportManageAct = ttReportManageActList.get(0); + reportEntity.setConfidentialLevel(ttReportManageAct.getConfidentialLevel()); + reportEntity.setPrivacyLevel(ttReportManageAct.getPrivacyLevel()); + } }else { throw new AdcDaBaseException("没有流程类型"+prcType); } @@ -566,7 +572,8 @@ public class TodoTaskController { //上传 TtReportManageAct ttReportManageAct = new TtReportManageAct(); if (StringUtils.isBlank(pId)){ - ttReportManageAct = ttReportManageActDao.selectByDataId(dataId); + List ttReportManageActs = ttReportManageActDao.selectByDataId(dataId); + ttReportManageAct = ttReportManageActs.get(0); }else { ttReportManageAct = ttReportManageActDao.selectByPrcId(pId); } @@ -579,7 +586,8 @@ public class TodoTaskController { //编辑 TtReportManageAct ttReportManageAct = new TtReportManageAct(); if (StringUtils.isBlank(pId)){ - ttReportManageAct = ttReportManageActDao.selectByDataId(dataId); + List ttReportManageActs = ttReportManageActDao.selectByDataId(dataId); + ttReportManageAct = ttReportManageActs.get(0); }else { ttReportManageAct = ttReportManageActDao.selectByPrcId(pId); } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessName.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessName.java index 86b5635..a3c633d 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessName.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessName.java @@ -113,7 +113,7 @@ public class BusProcessName implements Serializable { @TableField(exist = false) private String privacyLevel; - //提交状态 0:草稿、1:提交 对应枚举 SubmitStatusEnum + //提交状态 0:草稿、1:提交 2:删除 3:结束 对应枚举 SubmitStatusEnum @TableField("SUBMIT_STATUS") private String submitStatus; diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessNameService.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessNameService.java index b923d1f..a516845 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessNameService.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessNameService.java @@ -24,4 +24,6 @@ public interface IBusProcessNameService extends IService { * @return */ Map ruleGeneratePrcNumAndPrcNum(String prcType); + + void stopAct(String processInstanceId); } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.java index 99559e1..a285ba4 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.java @@ -4,7 +4,9 @@ import com.adc.da.wkflow.business_main.entity.BusProcessName; import com.adc.da.wkflow.business_main.mapper.BusProcessNameMapper; import com.adc.da.wkflow.business_main.service.IBusProcessNameService; import com.adc.da.wkflow.enums.FlowTypeEnum; +import com.adc.da.wkflow.enums.SubmitStatusEnum; import com.adc.da.wkflow.util.ImpulseSenderUtils; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.activiti.engine.ActivitiException; @@ -83,4 +85,13 @@ public class BusProcessNameServiceImpl extends ServiceImpl busProcessNameLambdaQueryWrapper = new LambdaQueryWrapper<>(); + busProcessNameLambdaQueryWrapper.eq(BusProcessName::getPrcId,processInstanceId); + BusProcessName busProcessName = new BusProcessName(); + busProcessName.setSubmitStatus(SubmitStatusEnum.STOP.getValue()); + baseMapper.update(busProcessName,busProcessNameLambdaQueryWrapper); + } + } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/enums/SubmitStatusEnum.java b/report-activity/src/main/java/com/adc/da/wkflow/enums/SubmitStatusEnum.java index a720f7e..891c786 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/enums/SubmitStatusEnum.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/enums/SubmitStatusEnum.java @@ -8,6 +8,7 @@ public enum SubmitStatusEnum { DRAFT("0","草稿"), SUBMIT("1","提交"), DELETE("2","删除"), + STOP("3","完成"), ; private String value; diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.java index 4cf2f20..0ad03c0 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.java @@ -8,6 +8,7 @@ import com.adc.da.report.service.ITtReportManageActService; import com.adc.da.wkflow.business_main.entity.BusProcessApprove; import com.adc.da.wkflow.business_main.entity.BusProcessNew; import com.adc.da.wkflow.business_main.service.IBusProcessApproveService; +import com.adc.da.wkflow.business_main.service.IBusProcessNameService; import com.adc.da.wkflow.business_main.service.IBusProcessNewService; import com.adc.da.wkflow.listener.FlagEnum; import com.adc.da.wkflow.util.SpringContextUtil; @@ -28,6 +29,7 @@ public class oneApplyAfter implements TaskListener { TtReportManageActDao ttReportManageActDao = SpringContextUtil.getBean(TtReportManageActDao.class); ReportDao reportDao = SpringContextUtil.getBean(ReportDao.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class); ITtReportManageActService ttReportManageActService = SpringContextUtil.getBean(ITtReportManageActService.class); //查询task任务 @@ -58,6 +60,7 @@ public class oneApplyAfter implements TaskListener { delegateTask.setVariable("flag",s); if ("1".equals(s)){ ttReportManageActService.saveOrUpdataReport(ttReportManageAct); + busProcessNameService.stopAct(delegateTask.getProcessInstanceId()); } } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/twoApplyAfter.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/twoApplyAfter.java index 15d32cf..6d34e9c 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/twoApplyAfter.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/twoApplyAfter.java @@ -7,6 +7,7 @@ import com.adc.da.report.eo.PowerApplyAct; import com.adc.da.wkflow.business_main.entity.BusProcessApprove; import com.adc.da.wkflow.business_main.entity.BusProcessNew; import com.adc.da.wkflow.business_main.service.IBusProcessApproveService; +import com.adc.da.wkflow.business_main.service.IBusProcessNameService; import com.adc.da.wkflow.business_main.service.IBusProcessNewService; import com.adc.da.wkflow.listener.FlagEnum; import com.adc.da.wkflow.util.SpringContextUtil; @@ -27,6 +28,7 @@ public class twoApplyAfter implements TaskListener { PowerApplyActDao powerApplyActDao = SpringContextUtil.getBean(PowerApplyActDao.class); PowerApplyDao powerApplyDao = SpringContextUtil.getBean(PowerApplyDao.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class); //查询task任务 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -60,8 +62,7 @@ public class twoApplyAfter implements TaskListener { delegateTask.setVariable("flag",s); if ("1".equals(s)){ powerApplyDao.savePowerAct(powerApplyAct); -// List collect = powerApplyActs.stream().map(e -> e.getId()).collect(Collectors.toList()); -// powerApplyActDao.batchDel(collect); + busProcessNameService.stopAct(delegateTask.getProcessInstanceId()); } } } diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class index 2c46a72..5ac17b1 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class index 55c70ed..6fc4ea8 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.class b/report-activity/target/classes/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.class index ef80b33..dc4898a 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.class and b/report-activity/target/classes/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.class b/report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.class index 9b70de3..66378d7 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.class and b/report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/listener/powerApply/twoApplyAfter.class b/report-activity/target/classes/com/adc/da/wkflow/listener/powerApply/twoApplyAfter.class index 654f6fe..ca86988 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/listener/powerApply/twoApplyAfter.class and b/report-activity/target/classes/com/adc/da/wkflow/listener/powerApply/twoApplyAfter.class differ