资料填报撤销接口bug

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -1052,8 +1052,8 @@ public class InformationWriteQueryController extends BladeController {
                     if (new Integer("1").equals(task.getStatus())) {
                         //正在审批，调用废除
                         this.taskClient.abolishTask(task);
-                    } else if (new Integer("2").equals(task.getStatus())) {
-                        //已审批的任务，修改业务数据的审批状态为未上报并撤签即可
+                    } else if (new Integer("2").equals(task.getStatus()) || new Integer("3").equals(task.getStatus())) {
+                        //已审批、已撤销的任务，修改业务数据的审批状态为未上报并撤签即可
                         LambdaUpdateWrapper<InformationQuery> wrapper = Wrappers.lambdaUpdate();
                         //更改状态为未上报
                         wrapper.set(InformationQuery::getStatus, 0);
@@ -1207,7 +1207,8 @@ public class InformationWriteQueryController extends BladeController {
                 return R.data(300, false, "废除失败");
             }
         }
-        return R.data(300, false, "废除失败");
+
+        return R.data(300, false, "未获取到任务信息，废除失败");
     }
 
     /**

blade-service/blade-business/src/main/java/org/springblade/business/mapper/TaskMapper.java

@@ -30,7 +30,7 @@ import java.util.List;
  */
 public interface TaskMapper extends BaseMapper<Task> {
 
-    Task queryTaskListByFormDataId(@Param("formDataId") String formDataId);
+    Task queryTaskListByFormDataId(@Param("formDataId") String formDataId, int type);
 
     List<Task> queryBatchList(@Param("projectId") String projectId, @Param("contractId") String contractId);
 

blade-service/blade-business/src/main/java/org/springblade/business/mapper/TaskMapper.xml

@@ -31,18 +31,23 @@
     </resultMap>
 
     <select id="queryTaskListByFormDataId" resultMap="taskResultMap">
-        select id,
-               form_data_id,
-               process_instance_id,
-               approval_type,
-               status,
-               batch,
-               project_id,
-               contract_id
+        select  id,
+                form_data_id,
+                process_instance_id,
+                approval_type,
+                status,
+                batch,
+                project_id,
+                contract_id
         from u_task
         where form_data_id like concat('%', #{formDataId}, '%')
-          and status in (1, 2)
-          and is_deleted = 0
+        <if test="type == 1">
+            and status in (1, 2, 3)
+        </if>
+        <if test="type == 2">
+            and status in (1, 2)
+        </if>
+        and is_deleted = 0
         order by create_time DESC limit 1
     </select>
 

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -138,7 +138,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
         String[] formDataIdArray = formDataIds.split(",");
         List<Long> taskIds = new ArrayList<>();
         for (String formDataId : formDataIdArray) {
-            Task task = this.baseMapper.queryTaskListByFormDataId(formDataId);
+            Task task = this.baseMapper.queryTaskListByFormDataId(formDataId, 2);
             if (!taskIds.contains(task.getId())) {
                 //查询审批人
                 List<TaskParallel> parallels = this.taskParallelService.queryApprovalUser(task.getProcessInstanceId());
@@ -333,7 +333,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
 
         String[] formDataIdArray = formDataIds.split(",");
         for (String formDataId : formDataIdArray) {
-            Task task = this.baseMapper.queryTaskListByFormDataId(formDataId);
+            Task task = this.baseMapper.queryTaskListByFormDataId(formDataId, 1);
             if (task != null && !record.contains(task.getId())) {
                 record.add(task.getId());
                 result.add(task);
@@ -609,7 +609,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
         RedisTemplate.opsForValue().set("sign-" + taskApprovalVO.getFormDataId(), "1", 60, TimeUnit.SECONDS);
 
         String pdfUrlEVisa = this.completeApprovalTask(taskApprovalVO);
-        System.out.println("电签操作成功buss-----"+pdfUrlEVisa);
+        System.out.println("电签操作成功buss-----" + pdfUrlEVisa);
         //TODO ============== 电签成功，修改试验状态，关联工程部位信息pdf（只有电签成功，才修改） liuYc 2023-03-16 ==============
         if ("OK".equals(taskApprovalVO.getFlag()) && StringUtils.isNotEmpty(pdfUrlEVisa)) {
             //已审批
@@ -651,7 +651,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
             //todo ============================ 执行电签区域 ============================
             //电签状态
             String eVisaStatus = this.eVisaClient.eVisa(JSONObject.parseObject(JSONObject.toJSONString(taskApprovalVO), EVisaTaskApprovalVO.class));
-            System.out.println("+++++"+eVisaStatus);
+            System.out.println("+++++" + eVisaStatus);
             //todo ============================ 执行电签区域 ============================
 
             //电签状态分为success/notPfxOrFile/error,当状态为error时就需要重新提交请求