diff --git a/adc-da-login/target/adc-da-login-2.5.0.jar b/adc-da-login/target/adc-da-login-2.5.0.jar index ffcf2a8..e6380c3 100644 Binary files a/adc-da-login/target/adc-da-login-2.5.0.jar and b/adc-da-login/target/adc-da-login-2.5.0.jar differ diff --git a/adc-da-main/target/adc-da-main-2.5.0.jar b/adc-da-main/target/adc-da-main-2.5.0.jar index d41c59e..20f2d7c 100644 Binary files a/adc-da-main/target/adc-da-main-2.5.0.jar and b/adc-da-main/target/adc-da-main-2.5.0.jar differ diff --git a/adc-da-main/target/adc-da-main-2.5.0.jar.original b/adc-da-main/target/adc-da-main-2.5.0.jar.original index 1d3cadb..88a672c 100644 Binary files a/adc-da-main/target/adc-da-main-2.5.0.jar.original and b/adc-da-main/target/adc-da-main-2.5.0.jar.original differ diff --git a/adc-da-main/target/surefire-reports/TEST-com.adc.da.rsa.RSATest.xml b/adc-da-main/target/surefire-reports/TEST-com.adc.da.rsa.RSATest.xml index 13e9514..6f4da25 100644 --- a/adc-da-main/target/surefire-reports/TEST-com.adc.da.rsa.RSATest.xml +++ b/adc-da-main/target/surefire-reports/TEST-com.adc.da.rsa.RSATest.xml @@ -1,5 +1,5 @@ - + @@ -18,7 +18,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -62,5 +62,5 @@ - + \ No newline at end of file diff --git a/adc-da-main/target/surefire-reports/com.adc.da.rsa.RSATest.txt b/adc-da-main/target/surefire-reports/com.adc.da.rsa.RSATest.txt index 83239d9..de10aa4 100644 --- a/adc-da-main/target/surefire-reports/com.adc.da.rsa.RSATest.txt +++ b/adc-da-main/target/surefire-reports/com.adc.da.rsa.RSATest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: com.adc.da.rsa.RSATest ------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.661 s - in com.adc.da.rsa.RSATest +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.928 s - in com.adc.da.rsa.RSATest diff --git a/adc-da-report/target/adc-da-report-2.5.0.jar b/adc-da-report/target/adc-da-report-2.5.0.jar index 716d0c0..d0e9433 100644 Binary files a/adc-da-report/target/adc-da-report-2.5.0.jar and b/adc-da-report/target/adc-da-report-2.5.0.jar differ diff --git a/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportLogBookServiceImpl.class b/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportLogBookServiceImpl.class index 6a74984..ed3e5f3 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportLogBookServiceImpl.class and b/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportLogBookServiceImpl.class differ diff --git a/adc-da-sys/target/adc-da-sys-2.5.0.jar b/adc-da-sys/target/adc-da-sys-2.5.0.jar index 83b26a3..8701367 100644 Binary files a/adc-da-sys/target/adc-da-sys-2.5.0.jar and b/adc-da-sys/target/adc-da-sys-2.5.0.jar 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 cf7adca..21b2e10 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 @@ -3,8 +3,10 @@ package com.adc.da.wkflow.business_activiti.task; import cn.hutool.core.util.StrUtil; import com.adc.da.login.util.UserUtils; import com.adc.da.report.dao.mysql.PowerApplyActDao; +import com.adc.da.report.dao.mysql.ReportDao; import com.adc.da.report.dao.mysql.TreeLabelDao; 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.vo.PowerApplyActPageVO; import com.adc.da.sys.service.iservice.IUserEoService; @@ -35,6 +37,7 @@ import com.adc.da.wkflow.util.wrapper.WrapMapper; import com.adc.da.wkflow.util.wrapper.Wrapper; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -79,6 +82,12 @@ public class TodoTaskController { @Resource private RepositoryService repositoryService; + @Autowired + private TtReportManageActDao ttReportManageActDao; + + @Autowired + private ReportDao reportDao; + @Resource private TaskTodoService taskTodoService; @@ -112,9 +121,6 @@ public class TodoTaskController { @Autowired private PowerApplyActDao powerApplyActDao; - @Autowired - private TtReportManageActDao ttReportManageActDao; - @Autowired private TreeLabelDao treeLableDao; @@ -177,7 +183,9 @@ public class TodoTaskController { if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) { queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType()); } - + if (taskCommonQuery.getCreatuserId() != null && !taskCommonQuery.getCreatuserId().equals("")) { + queryWrapper.eq("CREAT_USER", taskCommonQuery.getCreatuserId()); + } queryWrapper.lambda().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.SUBMIT.getValue()); BusProcessName busProcessName = iBusProcessNameService.getOne(queryWrapper); @@ -187,9 +195,9 @@ public class TodoTaskController { // } String taskId = entry.getValue().get(0).get("id").toString(); if (busProcessName != null) { -// if(StringUtils.isNotEmpty(taskId)){ -// taskIds = taskIds.substring(0,taskIds.length()-1); -// } + ReportEntity reportEntity = this.selectReport(busProcessName.getPrcType(),busProcessName.getDataId()); + busProcessName.setConfidentialLevel(reportEntity.getConfidentialLevel()); + busProcessName.setPrivacyLevel(reportEntity.getPrivacyLevel()); busProcessName.setTaskId(taskId); busProcessName.setTaskInfo(entry.getValue().get(0).get("name").toString()); busProcessName.setTaskDefinitionKey(entry.getValue().get(0).get("taskDefinitionKey").toString()); @@ -202,6 +210,26 @@ public class TodoTaskController { return Result.success(page); } + 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)){ + //下载 + 预览 + reportEntity = reportDao.selectById(dataId); + }else if("4".equals(prcType)){ + //上传 + TtReportManageAct ttReportManageAct = ttReportManageActDao.selectByDataId(dataId); + reportEntity.setConfidentialLevel(ttReportManageAct.getConfidentialLevel()); + reportEntity.setPrivacyLevel(ttReportManageAct.getPrivacyLevel()); + } + return reportEntity; + } + @ApiOperation(value = "改派任务") @ApiImplicitParams({@ApiImplicitParam(name = "taskId", value = "任务id"), @ApiImplicitParam(name = "assignee", value = "改派人员")}) @@ -307,6 +335,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); } return WrapMapper.ok(task.getProcessInstanceId()); } else { 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 06c5d16..86b5635 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 @@ -101,6 +101,18 @@ public class BusProcessName implements Serializable { @TableField(exist = false) private String status; + /** + * 报告涉密等级 + */ + @TableField(exist = false) + private String confidentialLevel; + + /** + * 隐私等级 + */ + @TableField(exist = false) + private String privacyLevel; + //提交状态 0:草稿、1:提交 对应枚举 SubmitStatusEnum @TableField("SUBMIT_STATUS") private String submitStatus; 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 5e5f2e1..e6946e1 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,10 +5,10 @@ package com.adc.da.wkflow.enums; */ public enum FlowTypeEnum { - XZSQ("1","下载申请流程","QXSQ","下载申请流程",""), - YLSQ("2","预览申请流程","QXSQ","预览申请流程",""), - YLXZSQ("3","预览+下载申请流程","QXSQ","预览+下载申请流程",""), - SCBGLC("4","上传审批流程","SCBG","上传审批流程",""), + XZSQ("1","下载申请","QXSQ","下载申请",""), + YLSQ("2","预览申请","QXSQ","预览申请",""), + YLXZSQ("3","预览+下载申请","QXSQ","预览+下载申请",""), + SCBGLC("4","上传审批","SCBG","上传审批",""), ; private String value; 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 b2838e5..5e822b0 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 9df54dd..fbd77a1 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/BusProcessName.class b/report-activity/target/classes/com/adc/da/wkflow/business_main/entity/BusProcessName.class index b49a609..578426c 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_main/entity/BusProcessName.class and b/report-activity/target/classes/com/adc/da/wkflow/business_main/entity/BusProcessName.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 e654ece..8965bc0 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/report-activity-2.5.0.jar b/report-activity/target/report-activity-2.5.0.jar index 81639c2..033b514 100644 Binary files a/report-activity/target/report-activity-2.5.0.jar and b/report-activity/target/report-activity-2.5.0.jar differ