diff --git a/adc-da-report/src/main/java/com/adc/da/report/Timer/secrecyDDLTimer.java b/adc-da-report/src/main/java/com/adc/da/report/Timer/secrecyDDLTimer.java new file mode 100644 index 0000000..40d5615 --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/Timer/secrecyDDLTimer.java @@ -0,0 +1,39 @@ +package com.adc.da.report.Timer; + +import com.adc.da.report.dao.mysql.ReportDao; +import com.adc.da.report.eo.ReportEntity; +import com.adc.da.util.utils.CollectionUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * 定时任务，扫描全部报告的 保密到期日期。 + * 当日日期 = 保密到期日期，则报告涉密等级自动改为 “公开（内部公开）” + * @Author： bpx + * @Date：2022/4/8; + */ +@Component +@EnableScheduling +@Slf4j +public class secrecyDDLTimer { + + @Autowired + ReportDao reportDao; + + @Scheduled(cron="0 0/10 * * * ?") + public void timingOpen() { + log.info("**********************保密到期定时任务开始**********************"); + List entity = reportDao.selectDDL(); + if (CollectionUtils.isNotEmpty(entity)){ + entity.forEach(e -> { + e.setConfidentialLevel("公开（内部公开）"); + }); + } + log.info("**********************保密到期定时任务结束**********************"); + } +} diff --git a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java index aec54ae..9c79032 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java +++ b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java @@ -65,4 +65,11 @@ public interface ReportDao extends BaseMapper { void saveReportAct(@Param("Vo") TtReportManageAct ttReportManageAct); ReportDetailVo reportDetail(@Param("reportId") String reportId); + + /** + * 查询保密到期的报告 + * @return + */ + List selectDDL(); + } diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.java index 56ff25a..4e02fa3 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.java @@ -71,6 +71,7 @@ public class IpowerApplyActServiceImpl extends ServiceImpl powerApplyList; } diff --git a/adc-da-report/src/main/java/com/adc/da/report/vo/ReportVo.java b/adc-da-report/src/main/java/com/adc/da/report/vo/ReportVo.java index e59301c..e78ba38 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/vo/ReportVo.java +++ b/adc-da-report/src/main/java/com/adc/da/report/vo/ReportVo.java @@ -121,6 +121,8 @@ public class ReportVo { */ private String createUserId; + private String createUserName; + /** * 创建人 */ diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml index 4fa7d5b..9c4a516 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml @@ -114,13 +114,21 @@ where a.data_id = #{dataId} 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 0cc9fd2..a9b513e 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 @@ -49,12 +49,15 @@ eo.fileid, eo.confidentialLevel, eo.privacyLevel, + eo.createUserId, + u.usname as createUserName, pa.report_id, pa.user_id FROM TT_REPORT_MANAGE eo LEFT JOIN tr_report_user ru ON eo.id = ru.reportId LEFT JOIN power_apply pa ON pa.report_id = eo.id + LEFT JOIN ts_user u on u.USID = eo.createUserId WHERE eo.DEL_FLAG = 0 @@ -261,4 +264,7 @@ WHERE rm.id = #{reportId} AND rm.del_flag = 0 + diff --git a/adc-da-report/target/classes/com/adc/da/report/eo/ReportLabelEntity.class b/adc-da-report/target/classes/com/adc/da/report/eo/ReportLabelEntity.class index 066487c..3b939e3 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/eo/ReportLabelEntity.class and b/adc-da-report/target/classes/com/adc/da/report/eo/ReportLabelEntity.class differ diff --git a/adc-da-report/target/classes/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.class b/adc-da-report/target/classes/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.class index fb77a02..33ba974 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.class and b/adc-da-report/target/classes/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.class differ diff --git a/adc-da-report/target/classes/com/adc/da/report/vo/PowerApplyActPageVO.class b/adc-da-report/target/classes/com/adc/da/report/vo/PowerApplyActPageVO.class index 68afde5..10e00c1 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/vo/PowerApplyActPageVO.class and b/adc-da-report/target/classes/com/adc/da/report/vo/PowerApplyActPageVO.class differ diff --git a/adc-da-report/target/classes/mybatis/mapper/mysql/PowerApplyActMapper.xml b/adc-da-report/target/classes/mybatis/mapper/mysql/PowerApplyActMapper.xml index 4fa7d5b..9c4a516 100644 --- a/adc-da-report/target/classes/mybatis/mapper/mysql/PowerApplyActMapper.xml +++ b/adc-da-report/target/classes/mybatis/mapper/mysql/PowerApplyActMapper.xml @@ -114,13 +114,21 @@ where a.data_id = #{dataId} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java index cf2db9c..fc52406 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java @@ -25,6 +25,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.binary.Base64; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -51,6 +52,7 @@ public class UserEOController extends BaseController { @Resource private IUserEoService userEOService; + @Autowired private UserOrgEODao userOrgEODao; @Value("${isPassEncrypted}") @@ -123,15 +125,17 @@ public class UserEOController extends BaseController { userOrgEOLambdaQueryWrapper.eq(UserOrgEO::getUserId,eo.getUsid()); userOrgEODao.delete(userOrgEOLambdaQueryWrapper); String orgId = eo.getOrgId(); - String[] split = orgId.split(","); - List userOrgEOS = new ArrayList<>(); - for (String s : split) { - UserOrgEO userOrgEO = new UserOrgEO(); - userOrgEO.setUserId(eo.getUsid()); - userOrgEO.setOrgId(s); - userOrgEOS.add(userOrgEO); + if (StringUtils.isNotEmpty(orgId)){ + String[] split = orgId.split(","); + List userOrgEOS = new ArrayList<>(); + for (String s : split) { + UserOrgEO userOrgEO = new UserOrgEO(); + userOrgEO.setUserId(eo.getUsid()); + userOrgEO.setOrgId(s); + userOrgEOS.add(userOrgEO); + } + userOrgEODao.insertBatch(userOrgEOS); } - userOrgEODao.insertBatch(userOrgEOS); return Result.success(); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserOrgEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserOrgEODao.java index 40beafe..be17835 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserOrgEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserOrgEODao.java @@ -1,7 +1,6 @@ package com.adc.da.sys.dao.mysql; import com.adc.da.sys.entity.UserOrgEO; -import com.adc.da.sys.entity.UserRoleEO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java index 45f96ee..894d313 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java @@ -231,7 +231,7 @@ public class ActivitDefineController { @PostMapping("/batchStartProcess") public Wrapper batchStartProcess(@RequestBody List startProcessEOList) { List busProcessNames = new ArrayList<>(); - StringBuilder stringBuilder = new StringBuilder(); + StringBuilder taskIds = new StringBuilder(); for (StartProcessEO startProcessEO : startProcessEOList) { startProcessEO.setLoginUserId(UserUtils.getUserId()); @@ -266,7 +266,7 @@ public class ActivitDefineController { task.setAssignee(userId); taskService.saveTask(task); - stringBuilder.append(","+task.getId()); + taskIds.append(","+task.getId()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); if(StringUtils.isEmpty(bpnId)) { @@ -310,7 +310,7 @@ public class ActivitDefineController { } ibusprocessnameService.saveBatch(busProcessNames); - String substring = stringBuilder.toString().substring(1, stringBuilder.length() - 1); + String substring = taskIds.toString().substring(1, taskIds.length()); return WrapMapper.ok(substring); } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java index 301d737..9ff49d7 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java @@ -11,13 +11,16 @@ import com.adc.da.report.service.IReportLabelService; import com.adc.da.report.service.ITtReportManageActService; import com.adc.da.util.utils.CollectionUtils; import com.adc.da.util.utils.StringUtils; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Date; +import java.util.List; import java.util.UUID; @Service @@ -48,15 +51,34 @@ public class ActivitDefineService { reportId = UUID.randomUUID().toString().replace("-",""); } if ("1".equals(prcType)){ + //预览 PowerApplyAct powerApplyAct = JSONObject.parseObject(dataJson, PowerApplyAct.class); - powerApplyAct.setId(UUID.randomUUID().toString().replaceAll("-","")); powerApplyAct.setDataId(reportId); powerApplyAct.setTaskId(taskId); powerApplyAct.setPrcId(prcId); powerApplyAct.setDelFlag(0); powerApplyAct.setCreateDate(new Date()); iPowerApplyActService.saveOrUpdateSingle(powerApplyAct); - }else if ("4".equals(prcType)){ + } else if("2".equals(prcType)){ + //预览 + 下载 + PowerApplyAct powerApplyAct = JSONObject.parseObject(dataJson, PowerApplyAct.class); + powerApplyAct.setDataId(reportId); + powerApplyAct.setTaskId(taskId); + powerApplyAct.setPrcId(prcId); + powerApplyAct.setDelFlag(0); + powerApplyAct.setCreateDate(new Date()); + iPowerApplyActService.saveOrUpdateSingle(powerApplyAct); + }else if("3".equals(prcType)){ + //下载 + PowerApplyAct powerApplyAct = JSONObject.parseObject(dataJson, PowerApplyAct.class); + powerApplyAct.setDataId(reportId); + powerApplyAct.setTaskId(taskId); + powerApplyAct.setPrcId(prcId); + powerApplyAct.setDelFlag(0); + powerApplyAct.setCreateDate(new Date()); + iPowerApplyActService.saveOrUpdateSingle(powerApplyAct); + } else if ("4".equals(prcType)){ + //上传 TtReportManageAct ttReportManageAct = JSONObject.parseObject(dataJson, TtReportManageAct.class); ttReportManageAct.setDataId(reportId); ttReportManageAct.setTaskId(taskId); @@ -68,11 +90,15 @@ public class ActivitDefineService { //修改报表标签关系表(先删后增) iReportLabelService.deleteReportLabelByReportId(new String[]{reportId}); if (CollectionUtils.isNotEmpty(ttReportManageAct.getLabelList())){ - ttReportManageAct.getLabelList().forEach((label) -> { + List labelList = new ArrayList<>(); + for (String label : ttReportManageAct.getLabelList()) { + JSONArray objects = JSONObject.parseArray(label); + String lastLabel =(String)objects.get(objects.size()-1); ReportLabelEntity reportLabelEntity = new ReportLabelEntity(com.adc.da.util.utils.UUID.randomUUID10() - ,ttReportManageAct.getDataId(), label); - reportLabelDao.insert(reportLabelEntity); - }); + ,ttReportManageAct.getDataId(), label,lastLabel); + labelList.add(reportLabelEntity); + } + iReportLabelService.saveBatch(labelList); } } return reportId; 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 21b2e10..91315fa 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 @@ -213,14 +213,14 @@ public class TodoTaskController { private ReportEntity selectReport(String prcType, String dataId) { ReportEntity reportEntity = new ReportEntity(); if ("1".equals(prcType)){ - //下载 - reportEntity = reportDao.selectById(dataId); - }else if ("2".equals(prcType)){ //预览 reportEntity = reportDao.selectById(dataId); - } else if ("3".equals(prcType)){ + }else if ("2".equals(prcType)){ //下载 + 预览 reportEntity = reportDao.selectById(dataId); + } else if ("3".equals(prcType)){ + //下载 + reportEntity = reportDao.selectById(dataId); }else if("4".equals(prcType)){ //上传 TtReportManageAct ttReportManageAct = ttReportManageActDao.selectByDataId(dataId); @@ -376,6 +376,11 @@ public class TodoTaskController { busProcessApprove.setDataId(reportId); ibusProcessApproveService.save(busProcessApprove); taskService.complete(busMes.getTaskId()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(BusProcessName::getPrcId,task.getProcessInstanceId()); + BusProcessName one = iBusProcessNameService.getOne(wrapper); + one.setDataId(reportId); + iBusProcessNameService.updateById(one); } } else { throw new AdcDaBaseException("缺少任务id，无法完成任务"); @@ -541,6 +546,7 @@ public class TodoTaskController { String pId = busProcessNew.getPId(); String dataId = busProcessNew.getDataId(); if ("1".equals(prcType)){ + //预览 PowerApplyActPageVO powerApplyAct = new PowerApplyActPageVO(); if (StringUtils.isBlank(pId)){ powerApplyAct = powerApplyActDao.selectListBydataId(dataId); @@ -550,7 +556,30 @@ public class TodoTaskController { String string = JSONArray.toJSONString(powerApplyAct); //去对应的 数据表查数据 busProcessNewVO.setDataJson(string); - }else if("4".equals(prcType)){ + }else if ("2".equals(prcType)){ + //预览 + 下载 + PowerApplyActPageVO powerApplyAct = new PowerApplyActPageVO(); + if (StringUtils.isBlank(pId)){ + powerApplyAct = powerApplyActDao.selectListBydataId(dataId); + }else { + powerApplyAct = powerApplyActDao.selectListByPrcId(pId); + } + String string = JSONArray.toJSONString(powerApplyAct); + //去对应的 数据表查数据 + busProcessNewVO.setDataJson(string); + }else if ("3".equals(prcType)){ + //下载 + PowerApplyActPageVO powerApplyAct = new PowerApplyActPageVO(); + if (StringUtils.isBlank(pId)){ + powerApplyAct = powerApplyActDao.selectListBydataId(dataId); + }else { + powerApplyAct = powerApplyActDao.selectListByPrcId(pId); + } + String string = JSONArray.toJSONString(powerApplyAct); + //去对应的 数据表查数据 + busProcessNewVO.setDataJson(string); + } else if("4".equals(prcType)){ + //上传 TtReportManageAct ttReportManageAct = new TtReportManageAct(); if (StringUtils.isBlank(pId)){ ttReportManageAct = ttReportManageActDao.selectByDataId(dataId); 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 dcd5441..ce4ee1a 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 @@ -43,7 +43,13 @@ public class BusProcessNameServiceImpl extends ServiceImpl result = new HashMap<>(); String prcName = ""; String prcNum = ""; - if(StringUtils.equals(FlowTypeEnum.XZSQ.getValue(), prcType)){ + if(StringUtils.equals(FlowTypeEnum.YLSQ.getValue(), prcType)){ + prcName = FlowTypeEnum.YLSQ.getPrcName(); + prcNum = FlowTypeEnum.YLSQ.getPrcNum(); + }else if(StringUtils.equals(FlowTypeEnum.YLXZSQ.getValue(), prcType)){ + prcName = FlowTypeEnum.YLXZSQ.getPrcName(); + prcNum = FlowTypeEnum.YLXZSQ.getPrcNum(); + }else if(StringUtils.equals(FlowTypeEnum.XZSQ.getValue(), prcType)){ prcName = FlowTypeEnum.XZSQ.getPrcName(); prcNum = FlowTypeEnum.XZSQ.getPrcNum(); }else if (StringUtils.equals(FlowTypeEnum.SCBGLC.getValue(), prcType)){ diff --git a/report-activity/src/main/java/com/adc/da/wkflow/enums/FlowTypeEnum.java b/report-activity/src/main/java/com/adc/da/wkflow/enums/FlowTypeEnum.java index e6946e1..1260b2c 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/enums/FlowTypeEnum.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/enums/FlowTypeEnum.java @@ -5,9 +5,9 @@ package com.adc.da.wkflow.enums; */ public enum FlowTypeEnum { - XZSQ("1","下载申请","QXSQ","下载申请",""), - YLSQ("2","预览申请","QXSQ","预览申请",""), - YLXZSQ("3","预览+下载申请","QXSQ","预览+下载申请",""), + YLSQ("1","预览申请","QXSQ","预览申请",""), + YLXZSQ("2","预览+下载申请","QXSQ","预览+下载申请",""), + XZSQ("3","下载申请","QXSQ","下载申请",""), SCBGLC("4","上传审批","SCBG","上传审批",""), ; diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/oneApplyAfter.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/oneApplyAfter.java index 25f3860..6280d15 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/oneApplyAfter.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/oneApplyAfter.java @@ -28,7 +28,7 @@ public class oneApplyAfter implements TaskListener { IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class); //查询task任务 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PowerApplyAct::getTaskId, delegateTask.getId()); + queryWrapper.eq(PowerApplyAct::getPrcId, delegateTask.getProcessInstanceId()); queryWrapper.eq(PowerApplyAct::getDelFlag, 0); List powerApplyActs = powerApplyActDao.selectList(queryWrapper); PowerApplyAct powerApplyAct = new PowerApplyAct(); diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/reEditAfter.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/reEditAfter.java index ab1b0b7..6f1403b 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/reEditAfter.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/reEditAfter.java @@ -30,7 +30,7 @@ public class reEditAfter implements TaskListener { IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class); //查询task任务 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PowerApplyAct::getTaskId, delegateTask.getId()); + queryWrapper.eq(PowerApplyAct::getPrcId, delegateTask.getProcessInstanceId()); queryWrapper.eq(PowerApplyAct::getDelFlag, 0); List powerApplyActs = powerApplyActDao.selectList(queryWrapper); PowerApplyAct powerApplyAct = new PowerApplyAct(); diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/startAfter.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/startAfter.java index 607d91e..8cc567e 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/startAfter.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/startAfter.java @@ -27,7 +27,7 @@ public class startAfter implements TaskListener { IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class); //查询task任务 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PowerApplyAct::getTaskId, delegateTask.getId()); + queryWrapper.eq(PowerApplyAct::getPrcId, delegateTask.getProcessInstanceId()); queryWrapper.eq(PowerApplyAct::getDelFlag, 0); List powerApplyActs = powerApplyActDao.selectList(queryWrapper); PowerApplyAct powerApplyAct = new PowerApplyAct(); @@ -46,6 +46,7 @@ public class startAfter implements TaskListener { //审批结果 LambdaQueryWrapper approveWrapper = new LambdaQueryWrapper<>(); approveWrapper.eq(BusProcessApprove::getTaskId, delegateTask.getId()); +// approveWrapper.eq(BusProcessApprove::getPrcId, delegateTask.getProcessInstanceId()); List list = approveService.list(approveWrapper); String fromValsJson = list.get(0).getFromValsJson(); JSONObject object = JSONObject.parseObject(fromValsJson); 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 0637841..0a6eac5 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 @@ -30,11 +30,12 @@ public class twoApplyAfter implements TaskListener { IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class); //查询task任务 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PowerApplyAct::getTaskId, delegateTask.getId()); + queryWrapper.eq(PowerApplyAct::getPrcId, delegateTask.getProcessInstanceId()); + queryWrapper.eq(PowerApplyAct::getDelFlag, 0); List powerApplyActs = powerApplyActDao.selectList(queryWrapper); PowerApplyAct powerApplyAct = new PowerApplyAct(); if (powerApplyActs.size()>0){ - powerApplyAct = powerApplyActs.get(0); + powerApplyAct = powerApplyActs.get(0); } //构建工作流代办 BusProcessNew busProcessNew = new BusProcessNew(); diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.class index ab08e70..892f212 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.class index 2dc8c07..5a316fb 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.class differ 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 5e822b0..540bb6b 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 fbd77a1..6023ef9 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 fa630bb..1cfe475 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/enums/FlowTypeEnum.class b/report-activity/target/classes/com/adc/da/wkflow/enums/FlowTypeEnum.class index 8965bc0..8fb4404 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/enums/FlowTypeEnum.class and b/report-activity/target/classes/com/adc/da/wkflow/enums/FlowTypeEnum.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/listener/powerApply/oneApplyAfter.class b/report-activity/target/classes/com/adc/da/wkflow/listener/powerApply/oneApplyAfter.class index 121c554..e43c584 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/listener/powerApply/oneApplyAfter.class and b/report-activity/target/classes/com/adc/da/wkflow/listener/powerApply/oneApplyAfter.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/listener/powerApply/reEditAfter.class b/report-activity/target/classes/com/adc/da/wkflow/listener/powerApply/reEditAfter.class index 9b7928d..d2dbb8c 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/listener/powerApply/reEditAfter.class and b/report-activity/target/classes/com/adc/da/wkflow/listener/powerApply/reEditAfter.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/listener/powerApply/startAfter.class b/report-activity/target/classes/com/adc/da/wkflow/listener/powerApply/startAfter.class index cad0f23..ba16a7f 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/listener/powerApply/startAfter.class and b/report-activity/target/classes/com/adc/da/wkflow/listener/powerApply/startAfter.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 a1ad792..b0e18c2 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