diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/ITtReportManageActService.java b/adc-da-report/src/main/java/com/adc/da/report/service/ITtReportManageActService.java index 91b4e82..c20f889 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/ITtReportManageActService.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/ITtReportManageActService.java @@ -19,5 +19,5 @@ public interface ITtReportManageActService { void deleteById(DeleteParamRequestVO deleteParamVO); - void saveReport(TtReportManageAct ttReportManageAct); + void saveOrUpdataReport(TtReportManageAct ttReportManageAct); } diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java index ba3b124..0c932f4 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java @@ -1,9 +1,11 @@ package com.adc.da.report.service.impl; +import cn.hutool.core.bean.BeanUtil; import com.adc.da.report.dao.mysql.PowerApplyDao; import com.adc.da.report.dao.mysql.ReportDao; import com.adc.da.report.dao.mysql.TtReportManageActDao; +import com.adc.da.report.eo.ReportEntity; import com.adc.da.report.eo.TtReportManageAct; import com.adc.da.report.service.IReportContentService; import com.adc.da.report.service.ITtReportManageActService; @@ -125,7 +127,7 @@ public class ITtReportManageActServiceImpl extends ServiceImpl @@ -180,8 +184,12 @@ t.department, t.maincontent, t.confidentialLevel, - t.privacyLevel + t.privacyLevel, + IF(bpn.id is null,1, + IF(bpn.end_time is null,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' WHERE t.del_flag = 0 diff --git a/adc-da-report/target/classes/com/adc/da/report/service/ITtReportManageActService.class b/adc-da-report/target/classes/com/adc/da/report/service/ITtReportManageActService.class index 65b9c55..0e3ea6c 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/service/ITtReportManageActService.class and b/adc-da-report/target/classes/com/adc/da/report/service/ITtReportManageActService.class differ diff --git a/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportContentServiceImpl.class b/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportContentServiceImpl.class index 91006f5..cbb1ab6 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportContentServiceImpl.class and b/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportContentServiceImpl.class differ 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 7821613..019ce74 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/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml index 4fb2ef3..495515f 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml @@ -19,7 +19,9 @@ and t3.NAME like "%"#{roleName}"%" - ORDER BY t1.UPDATE_TIME DESC)tt + GROUP BY t1.USID + ORDER BY t1.UPDATE_TIME DESC + )tt diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/dto/TaskCommonQuery.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/dto/TaskCommonQuery.java index 747cba3..36c1967 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/dto/TaskCommonQuery.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/dto/TaskCommonQuery.java @@ -56,4 +56,7 @@ public class TaskCommonQuery { @ApiModelProperty(value = "高级搜索字符串") private String advanceSearchVOStr; + + @ApiModelProperty(value = "发起人") + private String creatUserName; } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java index 4ea797b..00bd54d 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java @@ -122,6 +122,7 @@ public class TaskController { map.put("prcNum",one.getPrcNum()); Date createTime = busProcessEntrust.getCreateTime(); map.put("createTime",createTime); + map.put("approvalOpinion",busProcessEntrust.getApprovalOpinion()); if (i+1 != EOS.size()){ BusProcessEntrust busProcessEntrust1 = EOS.get(i + 1); Date endTime = busProcessEntrust1.getCreateTime(); 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 1e6f3b2..77ad726 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 @@ -186,6 +186,9 @@ public class TodoTaskController { if (taskCommonQuery.getCreatuserId() != null && !taskCommonQuery.getCreatuserId().equals("")) { queryWrapper.eq("CREAT_USER", taskCommonQuery.getCreatuserId()); } + if (taskCommonQuery.getCreatUserName() != null && !taskCommonQuery.getCreatUserName().equals("")) { + queryWrapper.like("CREATE_USER_NAME", taskCommonQuery.getCreatUserName()); + } queryWrapper.lambda().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.SUBMIT.getValue()); BusProcessName busProcessName = iBusProcessNameService.getOne(queryWrapper); @@ -262,7 +265,8 @@ public class TodoTaskController { @ApiImplicitParam(name = "pId", value = "流程实例ID")}) @GetMapping("/changeAssigneeNew") public Wrapper changeAssigneeNew(String taskId, String assignee, String userId, String pId, - @RequestParam(required = false,value = "replaceMap")String replaceMap) { + @RequestParam(required = false,value = "replaceMap")String replaceMap, + String approvalOpinion) { List list = Arrays.asList(taskId.split(",")); for (String str : list) { @@ -291,6 +295,7 @@ public class TodoTaskController { busProcessEntrust.setPrcId(pId); busProcessEntrust.setPrcName(one.getPrcName()); busProcessEntrust.setTaskId(str); + busProcessEntrust.setApprovalOpinion(approvalOpinion); iBusProcessEntrustService.save(busProcessEntrust); } } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessEntrust.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessEntrust.java index 299a4e8..ca1332f 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessEntrust.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessEntrust.java @@ -59,5 +59,10 @@ public class BusProcessEntrust implements Serializable { @TableField("VALID_FLAG") private String validFlag; + /** + * 审批意见 + */ + @TableField("APPROVAL_OPINION") + private String approvalOpinion; } 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 ce4ee1a..99559e1 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 @@ -55,6 +55,9 @@ public class BusProcessNameServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PowerApplyAct::getPrcId, delegateTask.getProcessInstanceId()); + queryWrapper.eq(PowerApplyAct::getTaskId, delegateTask.getId()); 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 cbb373c..933703f 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::getPrcId, delegateTask.getProcessInstanceId()); + queryWrapper.eq(PowerApplyAct::getTaskId, delegateTask.getId()); 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 8cc567e..373bb43 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::getPrcId, delegateTask.getProcessInstanceId()); + queryWrapper.eq(PowerApplyAct::getTaskId, delegateTask.getId()); 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/twoApplyAfter.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/twoApplyAfter.java index ae841c4..15d32cf 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 @@ -16,7 +16,6 @@ import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import java.util.List; -import java.util.stream.Collectors; /** * 权限申请流程 发起流程 @@ -31,7 +30,7 @@ public class twoApplyAfter implements TaskListener { IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class); //查询task任务 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PowerApplyAct::getPrcId, delegateTask.getProcessInstanceId()); + queryWrapper.eq(PowerApplyAct::getTaskId, delegateTask.getId()); queryWrapper.eq(PowerApplyAct::getDelFlag, 0); List powerApplyActs = powerApplyActDao.selectList(queryWrapper); PowerApplyAct powerApplyAct = new PowerApplyAct(); @@ -61,8 +60,8 @@ 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); +// List collect = powerApplyActs.stream().map(e -> e.getId()).collect(Collectors.toList()); +// powerApplyActDao.batchDel(collect); } } } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/util/ImpulseSenderUtils.java b/report-activity/src/main/java/com/adc/da/wkflow/util/ImpulseSenderUtils.java index 73c9a56..6dd096d 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/util/ImpulseSenderUtils.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/util/ImpulseSenderUtils.java @@ -110,6 +110,10 @@ public class ImpulseSenderUtils { number = bgqxsqNumber.incrementAndGet(); checkNumberLegitimate(number,"上传审批流程"); break; + case BJBGLC: + number = bgqxsqNumber.incrementAndGet(); + checkNumberLegitimate(number,"编辑审批流程"); + break; default: throw new ActivitiException("流程类型 " + flowType + " 非法!"); } diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/dto/TaskCommonQuery.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/dto/TaskCommonQuery.class index f43648b..e70576a 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/dto/TaskCommonQuery.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/dto/TaskCommonQuery.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController$1.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController$1.class index a22e351..0eef976 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController$1.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController$1.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController.class index 482266a..c3e9571 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController.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 2b6da33..2c46a72 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 67a692d..55c70ed 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/entity/BusProcessEntrust.class b/report-activity/target/classes/com/adc/da/wkflow/business_main/entity/BusProcessEntrust.class index 63336d0..61599a3 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_main/entity/BusProcessEntrust.class and b/report-activity/target/classes/com/adc/da/wkflow/business_main/entity/BusProcessEntrust.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 1cfe475..ef80b33 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 b97e81b..9b70de3 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/oneApplyAfter.class b/report-activity/target/classes/com/adc/da/wkflow/listener/powerApply/oneApplyAfter.class index e43c584..121c554 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 1086532..4878718 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 ba16a7f..74faa9b 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 f46c04a..654f6fe 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 diff --git a/report-activity/target/classes/com/adc/da/wkflow/util/ImpulseSenderUtils$1.class b/report-activity/target/classes/com/adc/da/wkflow/util/ImpulseSenderUtils$1.class index 8105b0d..8e791d5 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/util/ImpulseSenderUtils$1.class and b/report-activity/target/classes/com/adc/da/wkflow/util/ImpulseSenderUtils$1.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/util/ImpulseSenderUtils.class b/report-activity/target/classes/com/adc/da/wkflow/util/ImpulseSenderUtils.class index 294a178..5893885 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/util/ImpulseSenderUtils.class and b/report-activity/target/classes/com/adc/da/wkflow/util/ImpulseSenderUtils.class differ