修改bug：变更令>>撤销失败：未查出当前计量期对应任务信息

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

@@ -76,7 +76,7 @@ public class APIController {
         int current = dto.getCurrent();
         int size = dto.getSize();
         List<Object> params = new ArrayList<>();
-        StringBuilder sqlString = new StringBuilder("SELECT * FROM u_task WHERE 1=1 AND is_deleted = 0 AND approval_type in (5,6,7,8) "); //approval_type = 5 计量任务
+        StringBuilder sqlString = new StringBuilder("SELECT * FROM u_task WHERE 1=1 AND is_deleted = 0 AND approval_type in (5,6,7,11) "); //approval_type = 5 计量任务
         if(dto.getContractId()!=null&&dto.getProjectId()!=null){
             ContractInfo contractInfo = jdbcTemplate.queryForObject("select contract_type from m_contract_info where id = " + dto.getContractId(), new BeanPropertyRowMapper<>(ContractInfo.class));
             if (contractInfo != null && Arrays.asList(1, 4).contains(contractInfo.getContractType())) {

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

@@ -1129,7 +1129,7 @@ public class TaskController extends BladeController {
     public R<Integer> getTaskCount(@RequestParam Long projectId,@RequestParam(required = false) Long contractId){
         /*封装入参SQL*/
         List<Object> params = new ArrayList<>();
-        StringBuilder sqlString = new StringBuilder("SELECT * FROM u_task WHERE 1=1 AND is_deleted = 0 AND approval_type in (5,6,7,8) "); //approval_type = 5 计量任务
+        StringBuilder sqlString = new StringBuilder("SELECT * FROM u_task WHERE 1=1 AND is_deleted = 0 AND approval_type in (5,6,7,11) "); //approval_type = 5 计量任务
         Long userId1 = SecureUtil.getUserId();
         List<Long> projectIdss = jdbcTemplate.query("select project_id from m_project_assignment_user where user_id=" + userId1, new SingleColumnRowMapper<>(Long.class));
         sqlString.append(" AND project_id in(").append(StringUtils.join(projectIdss, ",")).append(")");
@@ -1211,7 +1211,7 @@ public class TaskController extends BladeController {
         int current = dto.getCurrent();
         int size = dto.getSize();
         List<Object> params = new ArrayList<>();
-        StringBuilder sqlString = new StringBuilder("SELECT * FROM u_task WHERE 1=1 AND is_deleted = 0 AND approval_type in (5,6,7,8) "); //approval_type = 5 计量任务
+        StringBuilder sqlString = new StringBuilder("SELECT * FROM u_task WHERE 1=1 AND is_deleted = 0 AND approval_type in (5,6,7,11) "); //approval_type = 5 计量任务
         Long userId1 = SecureUtil.getUserId();
         List<Long> projectIdss = jdbcTemplate.query("select project_id from m_project_assignment_user where user_id=" + userId1, new SingleColumnRowMapper<>(Long.class));
         sqlString.append(" AND project_id in(").append(StringUtils.join(projectIdss, ",")).append(")");
@@ -3929,7 +3929,12 @@ public class TaskController extends BladeController {
         try {
             String delTaskPall = "DELETE from u_task_parallel where process_instance_id in (SELECT process_instance_id from u_task where form_data_id ='" + periodId + "') ";
             String delTask = "DELETE from u_task where form_data_id ='" + periodId + "'";
-            Integer type1=type+5;
+            Integer type1;
+            if (type == 3) {
+                type1 = 11;
+            } else {
+                type1=type+5;
+            }
             //查询出当前计量期对应的任务
             String selectTask = "SELECT * from u_task WHERE approval_type =? and form_data_id = ? and is_deleted = 0 and status in (1,2)";
             List<Task> list = jdbcTemplate.query(selectTask, new BeanPropertyRowMapper<>(Task.class), type1,periodId);