add 查询草稿

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java

@@ -1,21 +1,33 @@
 package com.jero.modules.activiti.process.fb.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.DictPoint;
+import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.activiti.entity.ProcessNode;
 import com.jero.modules.activiti.mapper.ProcessNodeMapper;
+import com.jero.modules.activiti.process.common.entity.ProcessDraft;
+import com.jero.modules.activiti.process.common.service.ProcessDraftService;
 import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
+import com.jero.modules.laws.common.util.CurrentUserUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @Author: liao
@@ -32,6 +44,8 @@ public class ProcessFbInfoController {
     private ProcessNodeMapper processNodeMapper;
     @Resource
     private IProcessHandleService processHandleService;
+    @Resource
+    private ProcessDraftService processDraftService;
 
     @DictPoint
     @GetMapping("/getNodeList")
@@ -47,4 +61,17 @@ public class ProcessFbInfoController {
         return Result.OK(processNodeList);
     }
 
+    @ApiOperation(value = "查询草稿")
+    @GetMapping("/getDraftList")
+    public Result<?> getDraftList(ProcessDraft processDraft,
+                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+        LambdaQueryWrapper<ProcessDraft> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ProcessDraft::getUserId, CurrentUserUtil.getId());
+        queryWrapper.eq(!Objects.isNull(processDraft.getPrcType()), ProcessDraft::getPrcType, processDraft.getPrcType());
+        Page<ProcessDraft> page = new Page<>(pageNo, pageSize);
+        IPage<ProcessDraft> sentList = processDraftService.page(page, queryWrapper);
+        return Result.OK(sentList);
+    }
+
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java

@@ -134,7 +134,8 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
         editBusinessInfo(businessInfoDTO);
         processHandleService.approveTask(processInfoVO, pass);
 
-        String processInstanceId = processInfoVO.getBasicProcessInfoDTO().getProcessInstanceId();
+        BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
+        String processInstanceId = basicProcessInfoDTO.getProcessInstanceId();
         // 如果流程结束
         if (pass && processHandleService.isProcessFinish(processInstanceId)) {
             Map<String, Object> objectMap = JSON.parseObject(businessInfoDTO.getBusinessJson(), Map.class);
@@ -146,6 +147,7 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
                 // 如果是标准法规变更流程
                 lawsCommonService.commonEdit(objectMap);
             }
+            log.info("《标准法规入库/变更流程》结束，流程名称：{}", basicProcessInfoDTO.getProcessName());
         }
     }
 

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java

@@ -197,6 +197,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
         process.setCreateUserId(CurrentUserUtil.getId()); // 流程创建人
         process.setPrcName(basicProcessInfoDTO.getProcessName()); // 流程名称
         process.setMes(basicProcessInfoDTO.getProcessDescription()); // 流程说明
+        process.setPrcMes(basicProcessInfoDTO.getProcessDescription()); // 流程说明
         process.setDueTime(basicProcessInfoDTO.getProcessDueDate()); // 流程截止时间
         process.setPrcType(basicProcessInfoDTO.getProcessType()); // 流程类型
         process.setProjectId(processInfoVO.getBusinessId()); // 业务id