bug

Signed-off-by: liuyc <56808083@qq.com>

blade-service-api/blade-business-api/src/main/java/org/springblade/business/feign/TaskClient.java

@@ -155,17 +155,19 @@ public interface TaskClient {
     boolean saveFixedFlow(@RequestParam Long fixedFlowId, @RequestParam String fixedName, @RequestParam Long projectId, @RequestParam Long contractId);
 
     @PostMapping(value = "/saveFixedFlowLink")
-    void saveFixedFlowLink(@RequestParam Long fixedFlowId, @RequestParam String name, @RequestParam Integer type, @RequestParam String userIds, @RequestParam Long projectId,
+    void saveFixedFlowLink(@RequestParam Long fixedFlowId, @RequestParam String name, @RequestParam Integer type,
+                           @RequestParam String userIds, @RequestParam Long projectId,
                            @RequestParam Long contractId, @RequestParam Integer sort);
 
     @PostMapping(value = "/updateFixedFlow")
     boolean updateFixedFlow(@RequestParam Long fixedFlowId, @RequestParam String fixedName);
 
     @PostMapping(value = "/updateFixedFlowLink")
-    void updateFixedFlowLink(@RequestParam Long fixedFlowId, @RequestParam String name, @RequestParam Integer type, @RequestParam String userIds, @RequestParam Long projectId,
+    void updateFixedFlowLink(@RequestParam Long fixedFlowId, @RequestParam String name, @RequestParam Integer type,
+                             @RequestParam String userIds, @RequestParam Long projectId,
                              @RequestParam Long contractId, @RequestParam Integer sort);
 
     @PostMapping(value = "/getFixedFlowPage")
-    Page<Map<String, Object>> getFixedFlowPage(@RequestBody org.springblade.meter.dto.PageFixedFlowDTO dto);
+    List<Map<String, Object>> getFixedFlowPage(@RequestBody org.springblade.meter.dto.PageFixedFlowDTO dto);
 
 }

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/dto/UpdateFixedFlowDTO.java

@@ -25,7 +25,7 @@ public class UpdateFixedFlowDTO implements Serializable {
     private List<FixedBranch> fixedBranchList;
 
     @Data
-    public class FixedBranch {
+    public static class FixedBranch {
         @ApiModelProperty(value = "流程中的分支任务名称")
         private String name;
         @ApiModelProperty(value = "审批类型，1=垂直、2=平行")

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/TaskClientImpl.java

@@ -206,13 +206,15 @@ public class TaskClientImpl implements TaskClient {
         fixedFlow.setFixedFlowName(fixedName);
         fixedFlow.setProjectId(projectId);
         fixedFlow.setContractId(contractId);
+        fixedFlow.setStatus(1);
+        fixedFlow.setCreateTime(new Date());
         return fixedFlowServiceImpl.save(fixedFlow);
     }
 
     @Override
-    public void saveFixedFlowLink(Long fixedFlowId, String name, Integer type, String userIds, Long projectId, Long contractId, Integer sortBranch) {
+    public void saveFixedFlowLink(Long fixedFlowId, String name, Integer type, String userIds, Long projectId, Long contractId, Integer sort) {
         Map<Long, String> userMap = iUserClient.selectUserAll().stream().filter(f -> ObjectUtil.isNotEmpty(f.getRealName())).collect(Collectors.toMap(User::getId, User::getRealName));
-        int sort = 1;
+        int sortLink = 1;
         for (String userId : userIds.split(",")) {
             FixedFlowLink fixedFlowLink = new FixedFlowLink();
             fixedFlowLink.setFixedFlowId(fixedFlowId);
@@ -221,11 +223,11 @@ public class TaskClientImpl implements TaskClient {
             fixedFlowLink.setFixedFlowLinkUser(Long.parseLong(userId));
             fixedFlowLink.setFixedFlowLinkUserName(userMap.get(Long.parseLong(userId)));
             if (type.equals(1)) {
-                fixedFlowLink.setFixedFlowLinkSort(sort++);
+                fixedFlowLink.setFixedFlowLinkSort(sortLink++);
             }
             fixedFlowLink.setProjectId(projectId);
             fixedFlowLink.setContractId(contractId);
-            fixedFlowLink.setFixedFlowBranchSort(sortBranch);
+            fixedFlowLink.setFixedFlowBranchSort(sort);
             fixedFlowLinkServiceImpl.save(fixedFlowLink);
         }
     }
@@ -236,13 +238,12 @@ public class TaskClientImpl implements TaskClient {
     }
 
     @Override
-    public void updateFixedFlowLink(Long fixedFlowId, String name, Integer type, String userIds, Long projectId, Long contractId, Integer sortBranch) {
-        jdbcTemplate.update("DELETE FROM u_fixed_flow_link WHERE fixed_flow_id = ?", fixedFlowId);
-        this.saveFixedFlowLink(fixedFlowId, name, type, userIds, projectId, contractId, sortBranch);
+    public void updateFixedFlowLink(Long fixedFlowId, String name, Integer type, String userIds, Long projectId, Long contractId, Integer sort) {
+        this.saveFixedFlowLink(fixedFlowId, name, type, userIds, projectId, contractId, sort);
     }
 
     @Override
-    public Page<Map<String, Object>> getFixedFlowPage(PageFixedFlowDTO dto) {
+    public List<Map<String, Object>> getFixedFlowPage(PageFixedFlowDTO dto) {
         Page<FixedFlow> page = new Page<>(dto.getCurrent(), dto.getSize());
         IPage<FixedFlow> fixedFlowsPage = fixedFlowServiceImpl.getBaseMapper().selectPage(page,
                 Wrappers.<FixedFlow>lambdaQuery().eq(FixedFlow::getContractId, dto.getContractId()).eq(FixedFlow::getProjectId, dto.getProjectId()));
@@ -250,7 +251,7 @@ public class TaskClientImpl implements TaskClient {
         List<Long> collect = fixedFlows.stream().map(FixedFlow::getId).collect(Collectors.toList());
         if (collect.size() > 0) {
             List<FixedFlowLink> fixedFlowLinkList = fixedFlowLinkServiceImpl.getBaseMapper().selectList(
-                    Wrappers.<FixedFlowLink>lambdaQuery().in(FixedFlowLink::getFixedFlowId, collect));
+                    Wrappers.<FixedFlowLink>lambdaQuery().isNotNull(FixedFlowLink::getFixedFlowLink).in(FixedFlowLink::getFixedFlowId, collect));
             Map<Long, List<FixedFlowLink>> group = fixedFlowLinkList.stream().collect(Collectors.groupingBy(FixedFlowLink::getFixedFlowId));
             List<Map<String, Object>> result = new LinkedList<>();
             for (FixedFlow fixedFlow : fixedFlows) {
@@ -264,15 +265,9 @@ public class TaskClientImpl implements TaskClient {
                 }
                 result.add(map);
             }
-
-            Page<Map<String, Object>> resultMap = new Page<>();
-            resultMap.setCurrent(fixedFlowsPage.getCurrent());
-            resultMap.setSize(fixedFlowsPage.getSize());
-            resultMap.setTotal(fixedFlowsPage.getTotal());
-            resultMap.setRecords(result);
-            return resultMap;
+            return result;
         }
-        return new Page<>();
+        return null;
     }
 
 }

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -2877,11 +2877,16 @@ public class TaskController extends BladeController {
         return report;
    }
 
-    @GetMapping("/getFixedFlowPage")
+    @PostMapping("/getFixedFlowPage")
     @ApiOperationSupport(order = 21)
     @ApiOperation(value = "计量预设流程分页", notes = "传入dto")
     public R<Page<Map<String, Object>>> getFixedFlowPage(@RequestBody PageFixedFlowDTO dto) {
-        return R.data(taskClient.getFixedFlowPage(dto));
+        Page<Map<String, Object>> resultMap = new Page<>();
+        resultMap.setCurrent(dto.getCurrent());
+        resultMap.setSize(dto.getSize());
+        resultMap.setTotal(jdbcTemplate.queryForObject("SELECT count(1) FROM u_fixed_flow WHERE is_deleted = 0 AND project_id = ? AND contract_id = ?", Long.class, dto.getProjectId(), dto.getContractId()));
+        resultMap.setRecords(taskClient.getFixedFlowPage(dto));
+        return R.data(resultMap);
     }
 
     @PostMapping("/saveFixedFlow")
@@ -2903,7 +2908,6 @@ public class TaskController extends BladeController {
                 String[] userIdArray = userIds.split(",");
                 for (String userId : userIdArray) {
                     if (!allUserIds.add(userId)) {
-                        //如果添加失败，说明这个userId已经存在，表示有重复
                         duplicateUserIds.add(userId);
                     }
                 }
@@ -2931,7 +2935,7 @@ public class TaskController extends BladeController {
     @GetMapping("/getFixedFlow")
     @ApiOperationSupport(order = 23)
     @ApiOperation(value = "计量获取预设流程信息", notes = "传入预设流程id")
-    public R<FixedFlowVO> getFixedFlow(@RequestBody String id) {
+    public R<FixedFlowVO> getFixedFlow(@RequestParam String id) {
         FixedFlow fixedFlow = jdbcTemplate.query("SELECT * FROM u_fixed_flow WHERE is_deleted = 0 AND id = ?", new Object[]{id}, new BeanPropertyRowMapper<>(FixedFlow.class)).stream().findAny().orElse(null);
         if (fixedFlow != null) {
             List<FixedFlowLink> fixedFlowLinkList = jdbcTemplate.query("SELECT * FROM u_fixed_flow_link WHERE is_deleted = 0 AND fixed_flow_id = ?", new Object[]{fixedFlow.getId()}, new BeanPropertyRowMapper<>(FixedFlowLink.class));
@@ -2993,7 +2997,6 @@ public class TaskController extends BladeController {
                 String[] userIdArray = userIds.split(",");
                 for (String userId : userIdArray) {
                     if (!allUserIds.add(userId)) {
-                        //如果添加失败，说明这个userId已经存在，表示有重复
                         duplicateUserIds.add(userId);
                     }
                 }
@@ -3003,7 +3006,7 @@ public class TaskController extends BladeController {
             }
 
             if (taskClient.updateFixedFlow(dto.getFixedFlowId(), dto.getFixedName())) {
-
+                jdbcTemplate.update("DELETE FROM u_fixed_flow_link WHERE fixed_flow_id = ?", dto.getFixedFlowId());
                 int sort = 1;
                 for (UpdateFixedFlowDTO.FixedBranch fixedBranch : dto.getFixedBranchList()) {
                     taskClient.updateFixedFlowLink(dto.getFixedFlowId(), fixedBranch.getName(), fixedBranch.getType(),
@@ -3016,13 +3019,13 @@ public class TaskController extends BladeController {
         return R.fail("操作失败");
     }
 
-    @PostMapping("/deleteFixedFlowBranch")
+    /*@PostMapping("/deleteFixedFlowBranch")
     @ApiOperationSupport(order = 25)
     @ApiOperation(value = "计量刪除预设流程分支", notes = "传入预设流程id、分支名称")
     public R<Object> deleteFixedFlowBranch(@RequestParam String id, @RequestParam String name) {
         jdbcTemplate.update("DELETE FROM u_fixed_flow_link WHERE fixed_flow_id = ? AND fixed_flow_link = ?", new Object[]{id, name});
-        return R.fail("操作成功");
-    }
+        return R.success("操作成功");
+    }*/
 
     @PostMapping("/deleteFixedFlow")
     @ApiOperationSupport(order = 26)
@@ -3030,7 +3033,7 @@ public class TaskController extends BladeController {
     public R<Object> deleteFixedFlow(@RequestParam String id) {
         jdbcTemplate.update("DELETE FROM u_fixed_flow WHERE id = ?", new Object[]{id});
         jdbcTemplate.update("DELETE FROM u_fixed_flow_link WHERE fixed_flow_id = ?", new Object[]{id});
-        return R.fail("操作成功");
+        return R.success("操作成功");
     }
 
 }