完善新法规导入流程

2024-07-10 17:42:27 +08:00
parent bb572ededd
commit 71d5a77618
6 changed files with 64 additions and 18 deletions
@@ -185,6 +185,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
     * @Description: 转办
     **/
    @Override
+    @Transactional(rollbackFor = JeroBootException.class)
    public void transfer(String taskId, String toUserId) {
        isMyTask(taskId); // 判断是否拥有任务处理权限
        ProcessApprovalRecord processApprovalRecord = processApprovalRecordService.getToDoByTaskId(taskId);
@@ -101,7 +101,7 @@ public class ProcessNewStandardImportController extends JeroController<ProcessNe
    }

    /**
-     * 保存到待办
+     * 新法规导入流程-办理
     * @param taskId
     */
    @AutoLog(value = "新法规导入流程-办理")
@@ -2,6 +2,7 @@ package com.jero.modules.activiti.process.ni.entity;

 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -80,6 +81,22 @@ public class ProcessNewStandardImport implements Serializable {
    private String requireBriefDesc;
    /**抄送人员*/
    @ApiModelProperty(value = "抄送人员")
+    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
    private String copyUser;
-
+    /**适用市场*/
+    @ApiModelProperty(value = "标准类型")
+    @Dict(dicCode = "standard_type")
+    private String standardCategory;
+    /**标准名称*/
+    @ApiModelProperty(value = "标准名称")
+    @TableField(exist = false)
+    private String standardName;
+    /**标准编号*/
+    @ApiModelProperty(value = "标准编号")
+    @TableField(exist = false)
+    private String standardNumber;
+    /**代替标准编号*/
+    @ApiModelProperty(value = "代替标准编号")
+    @TableField(exist = false)
+    private String substituteStandardNumber;
 }
@@ -12,6 +12,12 @@ import com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport;
 */
 public interface ProcessNewStandardImportMapper extends BaseMapper<ProcessNewStandardImport> {

+    /**
+     * 根据id获取流程名称
+     * @param id
+     * @return
+     */
+    ProcessNewStandardImport getStandardNameById(String id);
 }


@@ -4,4 +4,14 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jero.modules.activiti.process.ni.mapper.ProcessNewStandardImportMapper">

+    <select id="getStandardNameById" resultType="com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport">
+        select standard_number,standard_name,substitute_standard_number from
+       (select id, standard_number,standard_name,substitute_standard_number
+       from laws_domestic_standard
+       where del_flag = 0
+       union all
+       select id, standard_number,standard_name,substitute_standard_number
+       from laws_enterprise_standard
+       where del_flag = 0) a where id = #{id}
+    </select>
 </mapper>
@@ -3,7 +3,6 @@ package com.jero.modules.activiti.process.ni.service.impl;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
@@ -32,6 +31,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;

 import static com.jero.modules.activiti.common.ActivitiCommon.PASS;

@@ -62,6 +62,9 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
    @Resource
    private IProcessHandleService processHandleService;

+    @Resource
+    private ProcessNewStandardImportMapper processNewStandardImportMapper;
+
    @Override
    @Transactional(rollbackFor = JeroBootException.class)
    public void startProcess(ProcessInfoVO<ProcessNewStandardImport> processInfoVO) {
@@ -107,6 +110,7 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
    }

    @Override
+    @Transactional(rollbackFor = JeroBootException.class)
    public void saveToDraft(ProcessInfoVO<ProcessNewStandardImport> processInfoVO) {
        // 流程信息
        BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
@@ -131,6 +135,7 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
    }

    @Override
+    @Transactional(rollbackFor = JeroBootException.class)
    public void approveTask(ProcessInfoVO<ProcessNewStandardImport> processInfoVO, boolean pass) {
        BasicTaskInfoDTO processTask = processInfoVO.getBasicTaskInfoDTO();
        String taskId = processTask.getTaskId();
@@ -197,24 +202,31 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
        String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
        // 获取流程通用数据
        ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId);
-        BasicProcessInfoDTO basicProcessInfoDTO = new BasicProcessInfoDTO();
-        basicProcessInfoDTO.setProcessName(process.getPrcName());
-        basicProcessInfoDTO.setProcessType(process.getPrcType());
-        basicProcessInfoDTO.setProcessDefinitionId(process.getProcessDefinitionId());
-        basicProcessInfoDTO.setProcessInstanceId(process.getProcessInstanceId());
-        basicProcessInfoDTO.setProcessDescription(process.getPrcMes());
-        basicProcessInfoDTO.setProcessDueDate(process.getDueTime());
-        result.setBasicProcessInfoDTO(basicProcessInfoDTO);
-        ProcessApprovalRecord record = actFlowCommonService.getNodeIdByTaskId(taskId);
-        String xmlNodeId = record.getNodeId();
-        // 设置流程信息
-        switch (xmlNodeId) {
-            //TODO
+        if(!Objects.isNull(process)){
+            BasicProcessInfoDTO basicProcessInfoDTO = new BasicProcessInfoDTO();
+            basicProcessInfoDTO.setProcessName(process.getPrcName());
+            basicProcessInfoDTO.setProcessType(process.getPrcType());
+            basicProcessInfoDTO.setProcessDefinitionId(process.getProcessDefinitionId());
+            basicProcessInfoDTO.setProcessInstanceId(process.getProcessInstanceId());
+            basicProcessInfoDTO.setProcessDescription(process.getPrcMes());
+            basicProcessInfoDTO.setProcessDueDate(process.getDueTime());
+            result.setBasicProcessInfoDTO(basicProcessInfoDTO);
        }
+
        LambdaQueryWrapper<ProcessNewStandardImport> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(ProcessNewStandardImport::getProcessInstanceId, processInstanceId);
-        ProcessNewStandardImport data = getOne(lambdaQueryWrapper);
-        result.setBusinessInfoDTO(data);
+        ProcessNewStandardImport data = getOne(lambdaQueryWrapper,false);
+        if(!Objects.isNull(data)){
+            ProcessNewStandardImport processNewStandardImport =
+                    processNewStandardImportMapper.getStandardNameById(data.getStandardId());
+            if(!Objects.isNull(processNewStandardImport)){
+                data.setStandardName(processNewStandardImport.getStandardName());
+                data.setStandardNumber(processNewStandardImport.getStandardNumber());
+                data.setStandardCategory(processNewStandardImport.getStandardCategory());
+                data.setSubstituteStandardNumber(processNewStandardImport.getSubstituteStandardNumber());
+            }
+            result.setBusinessInfoDTO(data);
+        }
        return result;
    }
 }