[修改] 流程中心变更

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

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)){
+                ReportEntity reportEntity = this.selectReport(busProcessName.getPrcType(),busProcessName.getDataId());
-//                    taskIds = taskIds.substring(0,taskIds.length()-1);
+                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<BusProcessName> 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 {

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;

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","下载申请流程",""),
+    XZSQ("1","下载申请","QXSQ","下载申请",""),
-    YLSQ("2","预览申请流程","QXSQ","预览申请流程",""),
+    YLSQ("2","预览申请","QXSQ","预览申请",""),
-    YLXZSQ("3","预览+下载申请流程","QXSQ","预览+下载申请流程",""),
+    YLXZSQ("3","预览+下载申请","QXSQ","预览+下载申请",""),
-    SCBGLC("4","上传审批流程","SCBG","上传审批流程",""),
+    SCBGLC("4","上传审批","SCBG","上传审批",""),
     ;
 
     private String value;