导入审批流

src/main/java/com/qdport/controller/PolicyCaseController.java

@@ -1,8 +1,6 @@
 package com.qdport.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qdport.entity.PolicyStrive;
-import com.qdport.entity.PolicyTodo;
 import com.qdport.enums.QDPortEnum;
 import com.qdport.modules.system.entity.SysUser;
 import com.qdport.modules.system.service.TSysUserService;
@@ -13,7 +11,6 @@ import com.qdport.service.impl.PolicySystemService;
 import com.qdport.util.StringUtil;
 import com.qdport.vo.PolicyFileVO;
 import com.qdport.vo.PolicyStriveVO;
-import lombok.AllArgsConstructor;
 import com.qdport.entity.PolicyCase;
 import com.qdport.service.PolicyCaseService;
 import com.qdport.query.PolicyCaseQuery;
@@ -32,7 +29,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
@@ -78,15 +74,17 @@ public class PolicyCaseController extends QdportController {
             model.setFileList(fileList);
 
             PolicyStrive strive = policyStriveService.getById(model.getStriveId());
-            PolicyStriveVO striveVO = new PolicyStriveVO();
-            BeanUtils.copyProperties(strive, striveVO);
-            createUser = sysUserService.getById(strive.getCreateId());
-            resultMap = policySystemService.getDeptNameAndCompanyName(createUser.getDeptId());
-            striveVO.setDeptName(resultMap.get("deptName"));
-            striveVO.setCompanyName(resultMap.get("companyName"));
-
-            model.setPolicyStrive(striveVO);
+            if (StringUtil.isNotEmpty(strive)) {
+                PolicyStriveVO striveVO = new PolicyStriveVO();
+                BeanUtils.copyProperties(strive, striveVO);
+                createUser = sysUserService.getById(strive.getCreateId());
+                resultMap = policySystemService.getDeptNameAndCompanyName(createUser.getDeptId());
+                striveVO.setDeptName(resultMap.get("deptName"));
+                striveVO.setCompanyName(resultMap.get("companyName"));
+                model.setPolicyStrive(striveVO);
+            }
         }
+
         return R.data(page);
     }
 
@@ -181,6 +179,15 @@ public class PolicyCaseController extends QdportController {
         return R.success("更新成功");
     }
 
+    @PostMapping("/resubmit")
+    @ApiOperation(value = "重新提交", notes = "传入PolicyCase")
+    public R resubmit(@RequestBody @Valid PolicyCaseVO vo) throws ExecutionException, InterruptedException {
+        vo.setStatus(QDPortEnum.POLICY_CASE_STATUS_APPROVE.getValue());
+        policyCaseService.approve(vo);
+        policyTodoService.save(vo);
+        return R.success("重新发起成功");
+    }
+
     /**
      * 删除
      */

src/main/java/com/qdport/controller/PolicyStriveController.java

@@ -138,7 +138,7 @@ public class PolicyStriveController extends QdportController {
     @PostMapping("/updateById")
     @ApiOperation(value = "月度维护、奖励分配", notes = "传入PolicyStrive")
     public R updateById(@RequestBody @Valid PolicyStriveVO vo) {
-        if (vo.getIsReward() == 1) {
+        if (StringUtil.isNotEmpty(vo.getIsReward()) && vo.getIsReward() == 1) {
             String partPersonArr = vo.getPartPersonArr();
             JSONArray array = JSON.parseArray(partPersonArr);
             BigDecimal total = BigDecimal.ZERO;
@@ -179,24 +179,18 @@ public class PolicyStriveController extends QdportController {
     public R refuse(@RequestBody @Valid PolicyStriveVO vo) {
         vo.setIsWithdraw(1);
         policyStriveService.refuse(vo);
-
-        vo.setStatus(QDPortEnum.POLICY_STRIVE_STATUS_INACTIVE.getValue());
-        vo.setUpdateTime(new Date());
-        policyStriveService.updateById(vo);
-
-        QueryWrapper<PolicyTodo> todoQueryWrapper = new QueryWrapper<>();
-        todoQueryWrapper.eq("REF_ID", vo.getId());
-        todoQueryWrapper.eq("REF_TYPE", QDPortEnum.POLICY_TODO_REFTYPE_POLICY_STRIVE.getValue());
-        todoQueryWrapper.eq("TODO_USER_ID", 1);
-        todoQueryWrapper.eq("TODO_TYPE", QDPortEnum.POLICY_TODO_TYPE_APPROVE.getValue());
-        todoQueryWrapper.eq("STATUS", QDPortEnum.POLICY_TODO_STATUS_ACTIVE.getValue());
-        PolicyTodo todo = new PolicyTodo();
-        todo.setStatus(QDPortEnum.POLICY_TODO_STATUS_DONE.getValue());
-        policyTodoService.update(todo, todoQueryWrapper);
-
         return R.success("更新成功");
     }
 
+    @PostMapping("/resubmit")
+    @ApiOperation(value = "重新提交", notes = "传入PolicyStrive")
+    public R resubmit(@RequestBody @Valid PolicyStriveVO vo) throws ExecutionException, InterruptedException {
+        vo.setStatus(QDPortEnum.POLICY_STRIVE_STATUS_APPROVE.getValue());
+        policyStriveService.approve(vo);
+        policyTodoService.save(vo);
+        return R.success("重新发起成功");
+    }
+
     /**
      * 删除
      */

src/main/java/com/qdport/service/impl/PolicyCaseServiceImpl.java

@@ -121,6 +121,8 @@ public class PolicyCaseServiceImpl extends ServiceImpl<PolicyCaseMapper, PolicyC
         strive.setId(vo.getStriveId());
         strive.setIsCase(1);
         policyStriveService.updateById(strive);
+
+        vo.setId(entity.getId());
     }
 
     @Override
@@ -160,6 +162,7 @@ public class PolicyCaseServiceImpl extends ServiceImpl<PolicyCaseMapper, PolicyC
             vo.setStatus(QDPortEnum.POLICY_CASE_STATUS_APPROVE.getValue());
            update(vo);
         }
+
         PolicyStrive strive = policyStriveService.getById(vo.getStriveId());
         PolicyStriveVO striveVO = new PolicyStriveVO();
         BeanUtils.copyProperties(strive, striveVO);
@@ -184,9 +187,13 @@ public class PolicyCaseServiceImpl extends ServiceImpl<PolicyCaseMapper, PolicyC
         String processTaskId = processService.getTaskIdByProcessInstanceId(vo.getProcessInstanceId());
         vo.setProcessTaskId(processTaskId);
 
-        vo.setStatus(QDPortEnum.POLICY_CASE_STATUS_DONE.getValue());
         vo.setUpdateTime(new Date());
         updateById(vo);
+
+        PolicyStrive strive = policyStriveService.getById(vo.getStriveId());
+        PolicyStriveVO striveVO = new PolicyStriveVO();
+        BeanUtils.copyProperties(strive, striveVO);
+        vo.setPolicyStrive(striveVO);
     }
 
     @Override

src/main/java/com/qdport/service/impl/PolicyStriveServiceImpl.java

@@ -195,7 +195,6 @@ public class PolicyStriveServiceImpl extends ServiceImpl<PolicyStriveMapper, Pol
         String processTaskId = processService.getTaskIdByProcessInstanceId(vo.getProcessInstanceId());
         vo.setProcessTaskId(processTaskId);
 
-        vo.setStatus(QDPortEnum.POLICY_STRIVE_STATUS_DONE.getValue());
         vo.setUpdateTime(new Date());
         updateById(vo);
     }
@@ -261,8 +260,8 @@ public class PolicyStriveServiceImpl extends ServiceImpl<PolicyStriveMapper, Pol
         Integer rewardType = vo.getRewardType();
         Integer isLand = vo.getIsLand();
         BigDecimal landAmount = vo.getLandAmount();
-        if (StringUtil.isEmpty(rewardType) || isLand == 0
-                || StringUtil.isEmpty(landAmount)) {
+        if (StringUtil.isEmpty(rewardType) || StringUtil.isEmpty(isLand)
+                || isLand == 0 || StringUtil.isEmpty(landAmount)) {
             return;
         }