计量流程使用过后不能修改删除

blade-service-api/blade-e-visa-api/src/main/java/org/springblade/evisa/vo/SigInfoVO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 import java.util.List;
 
 /**
- * @Param   批量电签传参
+ * @Param   批量电签传参- userSig是自定义的签字编号，code和password是账号密码
  * @Author wangwl
  * @Date 2024/1/18 17:21
  **/

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveExpertConclusionController.java

@@ -173,16 +173,16 @@ public class ArchiveExpertConclusionController extends BladeController {
     }
 
     /**
-     * 编写结论-测回提交
+     * 编写结论-撤回提交
      */
     @GetMapping("/repealTable")
     @ApiOperationSupport(order = 12)
-    @ApiOperation(value = "编写结论-测回提交", notes = "传入结论id")
+    @ApiOperation(value = "编写结论-撤回提交", notes = "传入结论id")
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "id", value = "结论id", required = true)
     })
     public R repealTable(@RequestParam Long id) {
         conclusionService.repealTable(id);
-        return R.data("测回成功");
+        return R.data("撤回成功");
     }
 }

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

@@ -3456,8 +3456,14 @@ public class TaskController extends BladeController {
         if (ObjectUtil.isEmpty(dto.getFixedBranchList()) || dto.getFixedBranchList().size() == 0) {
             return R.fail("请选择任务流程人员");
         }
-        if (ObjectUtil.isNotEmpty(dto.getFixedName())) {
+        List<Task> tasks = jdbcTemplate
+                .query("SELECT * FROM u_task WHERE contract_id = ? and is_deleted = 0 AND fixed_flow_id = ? ",
+                new Object[]{dto.getContractId(),dto.getFixedFlowId()}, new BeanPropertyRowMapper<>(Task.class));
+        if (tasks.size() > 0){
+            return R.fail("当前流程已经使用，不能修改");
+        }
 
+        if (ObjectUtil.isNotEmpty(dto.getFixedName())) {
             List<UpdateFixedFlowDTO.FixedBranch> fixedBranchList = dto.getFixedBranchList();
             Set<String> allUserIds = new HashSet<>();
             Set<String> duplicateUserIds = new HashSet<>();
@@ -3511,6 +3517,12 @@ public class TaskController extends BladeController {
     @ApiOperationSupport(order = 27)
     @ApiOperation(value = "计量刪除预设流程", notes = "传入预设流程id")
     public R<Object> deleteFixedFlow(@RequestParam String id) {
+        List<Task> tasks = jdbcTemplate
+                .query("SELECT * FROM u_task WHERE is_deleted = 0 AND fixed_flow_id = ? ",
+                        new Object[]{id}, new BeanPropertyRowMapper<>(Task.class));
+        if (tasks.size() > 0){
+            return R.fail("当前流程已经使用，不能删除");
+        }
         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.success("操作成功");