fix:任务相关补充

assistMg/src/main/java/com/hotent/constant/NodeConstant.java

@@ -2,8 +2,8 @@ package com.hotent.constant;
 
 public enum NodeConstant {
 
-    tjcl("tjcl", "提交材料"),
-    clcs("clcs", "材料初审"),
+    tjcl("tjcl", "提交资料"),
+    clcs("clcs", "资料初审"),
     sdshenhe("sdsh", "实地审核"),
     yjgaozhi("yjgz", "意见告知"),
     yjfk("yjfk", "意见反馈"),

assistMg/src/main/java/com/hotent/project/controller/CostProjectTaskMaterialController.java

@@ -10,6 +10,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.time.LocalDateTime;
 import java.util.List;
+
 import com.hotent.base.model.CommonResult;
 import com.hotent.base.util.StringUtil;
 import io.swagger.annotations.ApiOperation;
@@ -20,51 +21,55 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.hotent.base.controller.BaseController;
 import com.hotent.project.model.CostProjectTaskMaterial;
 import com.hotent.project.manager.CostProjectTaskMaterialManager;
+
 import javax.servlet.http.HttpServletResponse;
 
 /**
  * 任务定制-报送资料要求 前端控制器
  *
- * @company 山西清众科技股份有限公司
  * @author 超级管理员
+ * @company 山西清众科技股份有限公司
  * @since 2025-10-09
  */
 @RestController
 @RequestMapping("/costProjectTaskMaterial/v1/")
 public class CostProjectTaskMaterialController extends BaseController<CostProjectTaskMaterialManager, CostProjectTaskMaterial> {
 
-	/**
-	 * 根据taskId获取任务定制-报送资料要求数据列表
-	 * @param taskId 任务ID
-	 * @return
-	 * @throws Exception 
-	 */
-	@GetMapping(value="/listByTaskId")
-	@ApiOperation(value="根据taskId获取任务定制-报送资料要求数据列表",httpMethod = "GET",notes = "根据taskId获取任务定制-报送资料要求数据列表")
-	public CommonResult<List<CostProjectTaskMaterial>> listByTaskId(@ApiParam(name="taskId",value="任务ID", required = true)@RequestParam(required=true) String taskId) throws Exception{
-		return CommonResult.<List<CostProjectTaskMaterial>>ok().value(baseService.listByTaskId(taskId));
-	}
     /**
-	 * 新增,更新任务定制-报送资料要求
-	 * @param costProjectTaskMaterial
-	 * @throws Exception
-	 * @return
-	 * @exception
-	 */
-	@PostMapping(value="/save")
-	@ApiOperation(value = "新增,更新任务定制-报送资料要求数据", httpMethod = "POST", notes = "新增,更新任务定制-报送资料要求数据")
-	public CommonResult<String> save(@ApiParam(name="CostProjectTaskMaterial",value="任务定制-报送资料要求对象", required = true)@RequestBody CostProjectTaskMaterial costProjectTaskMaterial) throws Exception{
-		String msg = StringUtil.isEmpty(costProjectTaskMaterial.getId()) ? "添加任务定制-报送资料要求成功" : "更新任务定制-报送资料要求成功";
+     * 根据taskId获取任务定制-报送资料要求数据列表
+     *
+     * @param taskId 任务ID
+     * @return
+     * @throws Exception
+     */
+    @GetMapping(value = "/listByTaskId")
+    @ApiOperation(value = "根据taskId获取任务定制-报送资料要求数据列表", httpMethod = "GET", notes = "根据taskId获取任务定制-报送资料要求数据列表")
+    public CommonResult<List<CostProjectTaskMaterial>> listByTaskId(@ApiParam(name = "taskId", value = "任务ID", required = true) @RequestParam(required = true) String taskId) throws Exception {
+        return CommonResult.<List<CostProjectTaskMaterial>>ok().value(baseService.listByTaskId(taskId));
+    }
+
+    /**
+     * 新增,更新任务定制-报送资料要求
+     *
+     * @param costProjectTaskMaterial
+     * @return
+     * @throws Exception
+     * @throws
+     */
+    @PostMapping(value = "/save")
+    @ApiOperation(value = "新增,更新任务定制-报送资料要求数据", httpMethod = "POST", notes = "新增,更新任务定制-报送资料要求数据")
+    public CommonResult<String> save(@ApiParam(name = "CostProjectTaskMaterial", value = "任务定制-报送资料要求对象", required = true) @RequestBody CostProjectTaskMaterial costProjectTaskMaterial) throws Exception {
+        String msg = StringUtil.isEmpty(costProjectTaskMaterial.getId()) ? "添加任务定制-报送资料要求成功" : "更新任务定制-报送资料要求成功";
 
-		// 如果有文件上传，设置上传状态和时间
-		if(StringUtils.isNotBlank(costProjectTaskMaterial.getFileUrl())) {
-			costProjectTaskMaterial.setIsUpload("1");
-			costProjectTaskMaterial.setIsRequired("1");
-			costProjectTaskMaterial.setUploadTime(LocalDateTime.now());
-		}
+        // 如果有文件上传，设置上传状态和时间
+        if (StringUtils.isNotBlank(costProjectTaskMaterial.getFileUrl()) && "0".equals(costProjectTaskMaterial.getAuditedStatus())) {
+            costProjectTaskMaterial.setIsUpload("1");
+            costProjectTaskMaterial.setIsRequired("1");
+            costProjectTaskMaterial.setUploadTime(LocalDateTime.now());
+        }
 
-		// 调用Manager层保存，会自动处理任务节点和资料类别
-		baseService.createOrUpdate(costProjectTaskMaterial);
-		return CommonResult.<String>ok().message(msg);
-	}
+        // 调用Manager层保存，会自动处理任务节点和资料类别
+        baseService.createOrUpdate(costProjectTaskMaterial);
+        return CommonResult.<String>ok().message(msg);
+    }
 }

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

@@ -495,6 +495,14 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
     public String doProcessBtn(CostTaskPageReq req) {
 
         CostProjectTask task = costProjectTaskManager.getById(req.getTaskId());
+
+        // 检查任务是否已办结，只允许恢复操作
+        if (TaskStatusConstant.COMPLETED.getStatusCode().equals(task.getStatus())) {
+            if (!"2".equals(req.getKey())) {
+                throw new RuntimeException("任务已办结，仅支持恢复操作");
+            }
+        }
+
         String resultMessage = "";
         switch (req.getKey()) {
             case "1":
@@ -629,22 +637,46 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
      * 中止/恢复，如果是主任务中止，所有子任务同步中止；如果是主任务恢复，所有子任务同步恢复
      */
     private String suspendTask(CostProjectTask task, CostTaskPageReq req) {
+        // 恢复操作只支持主任务
+        if (!"0".equals(task.getPid())) {
+            throw new RuntimeException("仅支持主任务进行此操作");
+        }
+
         // 判断是中止还是恢复
         String status = req.getStatus() == null || TaskStatusConstant.SUSPENDED.getStatusCode().equals(req.getStatus()) ? TaskStatusConstant.SUSPENDED.getStatusCode() : TaskStatusConstant.AUDITING.getStatusCode();
 
-        // 如果是主任务 同步所有子任务的中止/恢复状态
-        if ("0".equals(task.getPid())) {
+        // 中止操作：保存中止前的状态
+        if (TaskStatusConstant.SUSPENDED.getStatusCode().equals(status)) {
+            task.setPreSuspendStatus(task.getStatus());
             List<CostProjectTask> children = costProjectTaskManager.list(
                     new LambdaQueryWrapper<CostProjectTask>()
                             .eq(CostProjectTask::getPid, task.getId())
                             .eq(CostProjectTask::getIsDeleted, "0")
             );
             for (CostProjectTask child : children) {
+                child.setPreSuspendStatus(child.getStatus());
                 child.setStatus(status);
                 costProjectTaskManager.updateById(child);
             }
+        } else {
+            // 恢复操作：恢复到中止前的状态
+            String preStatus = task.getPreSuspendStatus();
+            task.setStatus(StringUtil.isNotEmpty(preStatus) ? preStatus : TaskStatusConstant.AUDITING.getStatusCode());
+            task.setPreSuspendStatus(null);
+
+            List<CostProjectTask> children = costProjectTaskManager.list(
+                    new LambdaQueryWrapper<CostProjectTask>()
+                            .eq(CostProjectTask::getPid, task.getId())
+                            .eq(CostProjectTask::getIsDeleted, "0")
+            );
+            for (CostProjectTask child : children) {
+                String childPreStatus = child.getPreSuspendStatus();
+                child.setStatus(StringUtil.isNotEmpty(childPreStatus) ? childPreStatus : TaskStatusConstant.AUDITING.getStatusCode());
+                child.setPreSuspendStatus(null);
+                costProjectTaskManager.updateById(child);
+            }
         }
-        // 更新任务状态
+
         task.setStatus(status);
         costProjectTaskManager.updateById(task);
 

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

@@ -63,18 +63,18 @@ public class CostProjectTaskMaterialManagerImpl extends BaseManagerImpl<CostProj
 				costProjectTaskMaterial.setTaskNode(currentNode);
 
 				// 如果不是clcs节点，且有文件上传，需要根据文件类型设置informationType
-				if (!"clcs".equals(currentNode) && costProjectTaskMaterial.getFileUrl() != null) {
+				if (costProjectTaskMaterial.getFileUrl() != null) {
 					String fileUrl = costProjectTaskMaterial.getFileUrl();
 					String fileExtension = getFileExtension(fileUrl);
 
 					if (isWordFile(fileExtension)) {
 						// Word文件设置为3
-						costProjectTaskMaterial.setInformationType("1");
+						costProjectTaskMaterial.setFormatRequired("1");
 					} else if (isExcelFile(fileExtension)) {
 						// Excel文件设置为2
-						costProjectTaskMaterial.setInformationType("2");
+						costProjectTaskMaterial.setFormatRequired("2");
 					}else{
-						costProjectTaskMaterial.setInformationType("1");
+						costProjectTaskMaterial.setFormatRequired("1");
 					}
 				}
 			}

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

@@ -91,9 +91,9 @@ public class CostProjectDeliberate extends BaseModel<CostProjectDeliberate> {
     private String conclusionOpinion;
 
     @ApiModelProperty(value = "附件ID集合(多个附件用逗号分隔)")
-    @TableField("attachment_ids")
-    @JsonProperty("attachmentIds")
-    private String attachmentIds;
+    @TableField("attachment_url")
+    @JsonProperty("attachmentUrl")
+    private String attachmentUrl;
 
     @ApiModelProperty(value = "逻辑删除：0正常 1已删除")
     @TableField("is_deleted")
@@ -121,22 +121,6 @@ public class CostProjectDeliberate extends BaseModel<CostProjectDeliberate> {
     private String updateBy;
 
 
-    public String getTaskId() {
-        return taskId;
-    }
-
-    public void setTaskId(String taskId) {
-        this.taskId = taskId;
-    }
-
-    public Boolean getDeleted() {
-        return isDeleted;
-    }
-
-    public void setDeleted(Boolean deleted) {
-        isDeleted = deleted;
-    }
-
     public String getId() {
         return id;
     }
@@ -144,6 +128,7 @@ public class CostProjectDeliberate extends BaseModel<CostProjectDeliberate> {
     public void setId(String id) {
         this.id = id;
     }
+
     public String getProjectId() {
         return projectId;
     }
@@ -151,6 +136,15 @@ public class CostProjectDeliberate extends BaseModel<CostProjectDeliberate> {
     public void setProjectId(String projectId) {
         this.projectId = projectId;
     }
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
     public String getDeliberationForm() {
         return deliberationForm;
     }
@@ -158,6 +152,7 @@ public class CostProjectDeliberate extends BaseModel<CostProjectDeliberate> {
     public void setDeliberationForm(String deliberationForm) {
         this.deliberationForm = deliberationForm;
     }
+
     public LocalDateTime getBeginTime() {
         return beginTime;
     }
@@ -165,6 +160,7 @@ public class CostProjectDeliberate extends BaseModel<CostProjectDeliberate> {
     public void setBeginTime(LocalDateTime beginTime) {
         this.beginTime = beginTime;
     }
+
     public LocalDateTime getEndTime() {
         return endTime;
     }
@@ -172,6 +168,7 @@ public class CostProjectDeliberate extends BaseModel<CostProjectDeliberate> {
     public void setEndTime(LocalDateTime endTime) {
         this.endTime = endTime;
     }
+
     public String getLocation() {
         return location;
     }
@@ -179,6 +176,7 @@ public class CostProjectDeliberate extends BaseModel<CostProjectDeliberate> {
     public void setLocation(String location) {
         this.location = location;
     }
+
     public String getHostPerson() {
         return hostPerson;
     }
@@ -186,6 +184,7 @@ public class CostProjectDeliberate extends BaseModel<CostProjectDeliberate> {
     public void setHostPerson(String hostPerson) {
         this.hostPerson = hostPerson;
     }
+
     public String getRecordPerson() {
         return recordPerson;
     }
@@ -193,6 +192,7 @@ public class CostProjectDeliberate extends BaseModel<CostProjectDeliberate> {
     public void setRecordPerson(String recordPerson) {
         this.recordPerson = recordPerson;
     }
+
     public String getParticipants() {
         return participants;
     }
@@ -200,6 +200,7 @@ public class CostProjectDeliberate extends BaseModel<CostProjectDeliberate> {
     public void setParticipants(String participants) {
         this.participants = participants;
     }
+
     public String getEnterpriseId() {
         return enterpriseId;
     }
@@ -207,6 +208,7 @@ public class CostProjectDeliberate extends BaseModel<CostProjectDeliberate> {
     public void setEnterpriseId(String enterpriseId) {
         this.enterpriseId = enterpriseId;
     }
+
     public String getDeliberationContent() {
         return deliberationContent;
     }
@@ -214,6 +216,7 @@ public class CostProjectDeliberate extends BaseModel<CostProjectDeliberate> {
     public void setDeliberationContent(String deliberationContent) {
         this.deliberationContent = deliberationContent;
     }
+
     public String getConclusionOpinion() {
         return conclusionOpinion;
     }
@@ -221,20 +224,23 @@ public class CostProjectDeliberate extends BaseModel<CostProjectDeliberate> {
     public void setConclusionOpinion(String conclusionOpinion) {
         this.conclusionOpinion = conclusionOpinion;
     }
-    public String getAttachmentIds() {
-        return attachmentIds;
+
+    public String getAttachmentUrl() {
+        return attachmentUrl;
     }
 
-    public void setAttachmentIds(String attachmentIds) {
-        this.attachmentIds = attachmentIds;
+    public void setAttachmentUrl(String attachmentUrl) {
+        this.attachmentUrl = attachmentUrl;
     }
-    public Boolean getIsDeleted() {
+
+    public Boolean getDeleted() {
         return isDeleted;
     }
 
-    public void setIsDeleted(Boolean isDeleted) {
-        this.isDeleted = isDeleted;
+    public void setDeleted(Boolean deleted) {
+        isDeleted = deleted;
     }
+
     public LocalDateTime getCreateTime() {
         return createTime;
     }
@@ -242,6 +248,7 @@ public class CostProjectDeliberate extends BaseModel<CostProjectDeliberate> {
     public void setCreateTime(LocalDateTime createTime) {
         this.createTime = createTime;
     }
+
     public String getCreateBy() {
         return createBy;
     }
@@ -249,6 +256,7 @@ public class CostProjectDeliberate extends BaseModel<CostProjectDeliberate> {
     public void setCreateBy(String createBy) {
         this.createBy = createBy;
     }
+
     public LocalDateTime getUpdateTime() {
         return updateTime;
     }
@@ -256,6 +264,7 @@ public class CostProjectDeliberate extends BaseModel<CostProjectDeliberate> {
     public void setUpdateTime(LocalDateTime updateTime) {
         this.updateTime = updateTime;
     }
+
     public String getUpdateBy() {
         return updateBy;
     }
@@ -263,34 +272,4 @@ public class CostProjectDeliberate extends BaseModel<CostProjectDeliberate> {
     public void setUpdateBy(String updateBy) {
         this.updateBy = updateBy;
     }
-
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-    @Override
-    public String toString() {
-        return "CostProjectDeliberate{" +
-            "id=" + id +
-            ", projectId=" + projectId +
-            ", deliberationForm=" + deliberationForm +
-            ", beginTime=" + beginTime +
-            ", endTime=" + endTime +
-            ", location=" + location +
-            ", hostPerson=" + hostPerson +
-            ", recordPerson=" + recordPerson +
-            ", participants=" + participants +
-            ", enterpriseId=" + enterpriseId +
-            ", deliberationContent=" + deliberationContent +
-            ", conclusionOpinion=" + conclusionOpinion +
-            ", attachmentIds=" + attachmentIds +
-            ", isDeleted=" + isDeleted +
-            ", createTime=" + createTime +
-            ", createBy=" + createBy +
-            ", updateTime=" + updateTime +
-            ", updateBy=" + updateBy +
-        "}";
-    }
 }

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

@@ -175,4 +175,9 @@ public class CostProjectTask extends BaseModel<CostProjectTask> {
     @JsonProperty("archiveUser")
     private String archiveUser;
 
+    @ApiModelProperty(value = "中止前的状态")
+    @TableField("pre_suspend_status")
+    @JsonProperty("preSuspendStatus")
+    private String preSuspendStatus;
+
 }

assistMg/src/main/resources/mapper/CostProjectDeliberateMapper.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hotent.project.dao.CostProjectDeliberateDao">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hotent.project.model.CostProjectDeliberate">
-        <id column="id" property="id" />
-    <result column="project_id" property="projectId" />
-    <result column="deliberation_form" property="deliberationForm" />
-    <result column="begin_time" property="beginTime" />
-    <result column="end_time" property="endTime" />
-    <result column="location" property="location" />
-    <result column="host_person" property="hostPerson" />
-    <result column="record_person" property="recordPerson" />
-    <result column="participants" property="participants" />
-    <result column="enterprise_id" property="enterpriseId" />
-    <result column="deliberation_content" property="deliberationContent" />
-    <result column="conclusion_opinion" property="conclusionOpinion" />
-    <result column="attachment_ids" property="attachmentIds" />
-    <result column="is_deleted" property="isDeleted" />
-    <result column="create_time" property="createTime" />
-    <result column="create_by" property="createBy" />
-    <result column="update_time" property="updateTime" />
-    <result column="update_by" property="updateBy" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, project_id, deliberation_form, begin_time, end_time, location, host_person, record_person, participants, enterprise_id, deliberation_content, conclusion_opinion, attachment_ids, is_deleted, create_time, create_by, update_time, update_by
-    </sql>
-
-	<select id="selectPage" resultMap="BaseResultMap">
-		select 
-			<include refid="Base_Column_List"/> 
-		from
-			cost_project_deliberate
-		${ew.customSqlSegment}
-	</select>
-	
-	<select id="selectList" resultMap="BaseResultMap">
-		select 
-			<include refid="Base_Column_List"/> 
-		from
-			cost_project_deliberate
-		${ew.customSqlSegment}
-	</select>
-	
-	<select id="selectById" resultMap="BaseResultMap">
-		select 
-			<include refid="Base_Column_List"/> 
-		from
-			cost_project_deliberate
-		where 
-		    id = ${id}
-	</select>
-</mapper>