fit:成本调查表-调查表填报（单记录）

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectApprovalManagerImpl.java

@@ -270,6 +270,7 @@ public class CostProjectApprovalManagerImpl extends BaseManagerImpl<CostProjectA
 
         CostProjectTaskProccess taskProccess = costProjectTaskProccessManager.getOne(
                 new QueryWrapper<CostProjectTaskProccess>().eq("project_id", costProjectApproval.getProjectId())
+                        .last("limit 1")
         );
         if (taskProccess !=null ) {
             detailResp.setPlannedAuditStartDate(taskProccess.getPlannedAuditStartDate());
@@ -621,10 +622,7 @@ public class CostProjectApprovalManagerImpl extends BaseManagerImpl<CostProjectA
                             .eq(CostProjectTask::getAuditedUnitId, unit.getUnitId())
                             .eq(CostProjectTask::getIsDeleted, 0)
             );
-//            CostProjectTaskProccess taskProccess = costProjectTaskProccessManager.getOne(
-//                    new LambdaQueryWrapper<CostProjectTaskProccess>()
-//                            .eq(CostProjectTaskProccess::getTaskId, userTask.getId())
-//            );
+
 
             if(userTask!=null) {
                 // 设置子任务对象

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectTaskManagerImpl.java

@@ -144,8 +144,9 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
 
             List<CostProjectTask> childTasks = costProjectTaskManager.list(childQueryWrapper);
             for (CostProjectTask childTask : childTasks) {
-                childTask.setStatus(TaskStatusConstant.getStatusNameByCode(childTask.getStatus()));
+                childTask.setStatusName(TaskStatusConstant.getStatusNameByCode(childTask.getStatus()));
             }
+            rootTask.setStatusName(TaskStatusConstant.getStatusNameByCode(rootTask.getStatus()));
             rootTask.setChildTasks(childTasks);
             rootTask.setCurrentNodeName(NodeConstant.getNodeValueByKey(rootTask.getCurrentNode()));
         }
@@ -236,15 +237,9 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
     public String saveTask(CostTaskPageReq costTaskPageReq) {
         // 1.校验内容是否填写完毕！todo
 
-        // 2. 流程阶段变为资料初审
-        CostProjectTaskProccess taskProccess = costProjectTaskProccessManager.getOne(
-                new QueryWrapper<CostProjectTaskProccess>()
-                        .eq("task_id", costTaskPageReq.getTaskId())
-        );
-        taskProccess.setCurrentNode(NodeConstant.clcs.getNodeKey());
-        costProjectTaskProccessManager.updateById(taskProccess);
 
-        // 3. 子流程状态改为审核中
+
+        // 2. 子流程状态改为审核中
         CostProjectTask task = this.getById(costTaskPageReq.getTaskId());
         task.setCurrentNode(NodeConstant.clcs.getNodeKey());
         task.setStatus(TaskStatusConstant.AUDITING.getStatusCode());
@@ -316,10 +311,10 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
                 new LambdaQueryWrapper<CostProjectTask>()
                         .eq(CostProjectTask::getPid, nTask.getId())
         );
-        boolean b = children.stream().allMatch(child ->
-                child.getStatus().equals(TaskStatusConstant.COMPLETED.getStatusCode()));
+        boolean b = children.stream().noneMatch(child ->
+                child.getStatus().equals(TaskStatusConstant.AUDITING.getStatusCode()));
         if (!b) {
-            throw new RuntimeException("子任务未全部办结，主任务无法办结");
+            throw new RuntimeException("子任务未全部办理，主任务无法办结");
         }
         task.setStatus(TaskStatusConstant.COMPLETED.getStatusCode());
         costProjectTaskManager.updateById(task);
@@ -532,9 +527,12 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
                 break;
         }
         for (CostProjectTask child : children) {
-            child.setStatus(status);
-            child.setCurrentNode(nextNodeStatus);
-            costProjectTaskManager.updateById(child);
+            if (!child.getStatus().equals(TaskStatusConstant.SUSPENDED.getStatusCode())){
+                child.setStatus(status);
+                child.setCurrentNode(nextNodeStatus);
+                costProjectTaskManager.updateById(child);
+            }
+
         }
         // 通知内容组装
         String title = NodeConstant.getNodeValueByKey(task.getCurrentNode())+"扭转至下一步";

assistMg/src/main/java/com/hotent/project/model/CostProjectTask.java

@@ -92,7 +92,7 @@ public class CostProjectTask extends BaseModel<CostProjectTask> {
 
     @ApiModelProperty(value = "状态名称")
     @TableField(exist = false)
-    private String statusName;
+    private String q;
 
     @ApiModelProperty(value = "序号")
     @TableField("order_num")