Merge remote-tracking branch 'origin/master'

assistMg/docs/api/CostAuditTaskInfo_API.md

@@ -0,0 +1,326 @@
+# 动态表接口文档
+
+## 基础信息
+
+- **基础路径**: `/api/enterprise/castTaskInfo`
+- **接口分组**: 成本监审任务填报
+- **适用范围**: 动态表（模板类型3）
+
+---
+
+## 1. 新增监审期间记录
+
+### 接口信息
+- **路径**: `/addPeriodRecord`
+- **方法**: `POST`
+- **描述**: 新增监审期间记录，用于动态表。**必须先创建监审期间记录，然后才能编辑保存数据**
+
+### 请求参数
+
+**请求体**: `CostAuditPeriodRecord`
+
+| 字段名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| uploadId | String | 条件必填 | 关联上传记录ID（如果为空，需要提供catalogId和surveyTemplateId自动创建） |
+| auditedUnitId | String | 是 | 企业ID |
+| auditPeriod | String | 是 | 监审期间（年份，如：2024） |
+| catalogId | String | 条件必填 | 监管目录ID（当uploadId为空时必填） |
+| surveyTemplateId | String | 条件必填 | 成本调查表模板ID（当uploadId为空时必填） |
+| reportingTime | LocalDateTime | 否 | 填报时间（不传则使用当前时间） |
+
+### 请求示例
+
+#### 方式一：已有uploadId
+
+```json
+{
+  "uploadId": "upload123",
+  "auditedUnitId": "unit123",
+  "auditPeriod": "2024"
+}
+```
+
+#### 方式二：没有uploadId，自动创建
+
+```json
+{
+  "catalogId": "catalog123",
+  "surveyTemplateId": "template123",
+  "auditedUnitId": "unit123",
+  "auditPeriod": "2024"
+}
+```
+
+### 响应示例
+
+```json
+{
+  "code": 200,
+  "message": "新增监审期间记录成功",
+  "value": {
+    "id": "period123",
+    "uploadId": "upload123",
+    "auditedUnitId": "unit123",
+    "auditPeriod": "2024",
+    "reportingTime": "2025-12-22T14:12:23",
+    "createTime": "2025-12-22T14:12:23",
+    "updateTime": "2025-12-22T14:12:23"
+  }
+}
+```
+
+### 错误响应
+
+```json
+{
+  "code": 500,
+  "message": "uploadId为空时，catalogId和surveyTemplateId不能为空",
+  "value": null
+}
+```
+
+或
+
+```json
+{
+  "code": 500,
+  "message": "auditPeriod不能为空",
+  "value": null
+}
+```
+
+---
+
+## 2. 查询监审期间记录列表
+
+### 接口信息
+- **路径**: `/listPeriodRecord`
+- **方法**: `POST`
+- **描述**: 查询监审期间记录列表，返回记录列表
+
+### 请求参数
+
+**请求体**: `CostAuditPeriodRecord`
+
+| 字段名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| uploadId | String | 是 | 关联上传记录ID |
+| auditedUnitId | String | 是 | 企业ID |
+
+### 请求示例
+
+```json
+{
+  "uploadId": "upload123",
+  "auditedUnitId": "unit123"
+}
+```
+
+### 响应示例
+
+```json
+{
+  "code": 200,
+  "message": "success",
+  "value": [
+    {
+      "id": "period1",
+      "uploadId": "upload123",
+      "auditedUnitId": "unit123",
+      "auditPeriod": "2024",
+      "reportingTime": "2025-12-22T14:12:23",
+      "createTime": "2025-12-22T14:12:23",
+      "updateTime": "2025-12-22T15:12:23"
+    },
+    {
+      "id": "period2",
+      "uploadId": "upload123",
+      "auditedUnitId": "unit123",
+      "auditPeriod": "2023",
+      "reportingTime": "2025-12-21T14:12:23",
+      "createTime": "2025-12-21T14:12:23",
+      "updateTime": "2025-12-21T15:12:23"
+    }
+  ]
+}
+```
+
+---
+
+## 3. 删除监审期间记录
+
+### 接口信息
+- **路径**: `/deletePeriodRecord`
+- **方法**: `POST`
+- **描述**: 删除监审期间记录
+
+### 请求参数
+
+| 参数名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| id | String | 是 | 记录ID |
+
+### 请求示例
+
+```
+POST /api/enterprise/castTaskInfo/deletePeriodRecord?id=period123
+```
+
+### 响应示例
+
+```json
+{
+  "code": 200,
+  "message": "删除监审期间记录成功",
+  "value": null
+}
+```
+
+---
+
+## 4. 保存成本调查表模板上传数据（动态表）
+
+### 接口信息
+- **路径**: `/saveUploadData`
+- **方法**: `POST`
+- **描述**: 保存成本调查表模板上传数据（动态表专用）。**必须先创建监审期间记录，然后在数据中包含 `periodRecordId`**
+
+### 请求参数
+
+**请求体**: `List<CostSurveyTemplateUploadData>`
+
+| 字段名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| uploadId | String | 否 | 关联上传记录ID（如果为空，会根据catalogId和surveyTemplateId自动创建） |
+| auditedUnitId | String | 是 | 企业ID |
+| periodRecordId | String | **是** | 关联监审期间记录ID（**动态表必填**） |
+| rowid | String | 是 | 行数据ID（标识同一行的数据） |
+| rkey | String | 是 | 数据key（动态字段名） |
+| rvalue | String | 否 | 数据值（动态字段值） |
+| catalogId | String | 条件必填 | 监管目录ID（当uploadId为空时必填） |
+| surveyTemplateId | String | 条件必填 | 成本调查表模板ID（当uploadId为空时必填） |
+
+### 请求示例
+
+```json
+[
+  {
+    "uploadId": "upload123",
+    "auditedUnitId": "unit123",
+    "periodRecordId": "period123",
+    "rowid": "row1",
+    "rkey": "机构名称",
+    "rvalue": "XX公司"
+  },
+  {
+    "uploadId": "upload123",
+    "auditedUnitId": "unit123",
+    "periodRecordId": "period123",
+    "rowid": "row1",
+    "rkey": "机构地址",
+    "rvalue": "XX市XX区"
+  }
+]
+```
+
+### 响应示例
+
+```json
+{
+  "code": 200,
+  "message": "保存数据成功",
+  "value": null
+}
+```
+
+### 错误响应
+
+```json
+{
+  "code": 500,
+  "message": "动态表需要先创建监审期间记录，periodRecordId不能为空",
+  "value": null
+}
+```
+
+---
+
+## 5. 查询成本调查表模板上传数据（动态表）
+
+### 接口信息
+- **路径**: `/getUploadData`
+- **方法**: `POST`
+- **描述**: 查询成本调查表模板上传数据，返回实体类列表（支持按periodRecordId查询）
+
+### 请求参数
+
+**请求体**: `CostSurveyTemplateUploadData`
+
+| 字段名 | 类型 | 必填 | 说明 |
+|--------|------|------|------|
+| uploadId | String | 是 | 关联上传记录ID |
+| auditedUnitId | String | 是 | 企业ID |
+| periodRecordId | String | 否 | 关联监审期间记录ID（不传则查询所有数据） |
+
+### 请求示例
+
+```json
+{
+  "uploadId": "upload123",
+  "auditedUnitId": "unit123",
+  "periodRecordId": "period123"
+}
+```
+
+### 响应示例
+
+```json
+{
+  "code": 200,
+  "message": "success",
+  "value": [
+    {
+      "id": "data1",
+      "uploadId": "upload123",
+      "auditedUnitId": "unit123",
+      "periodRecordId": "period123",
+      "rowid": "row1",
+      "rkey": "机构名称",
+      "rvalue": "XX公司"
+    },
+    {
+      "id": "data2",
+      "uploadId": "upload123",
+      "auditedUnitId": "unit123",
+      "periodRecordId": "period123",
+      "rowid": "row1",
+      "rkey": "机构地址",
+      "rvalue": "XX市XX区"
+    }
+  ]
+}
+```
+
+---
+
+## 使用流程说明
+
+### 动态表完整操作流程
+
+1. **创建监审期间记录**
+   - 调用 `/addPeriodRecord` 创建监审期间记录
+   - 获取返回的 `periodRecordId`
+
+2. **保存数据**
+   - 调用 `/saveUploadData` 保存数据
+   - **必须在数据中包含 `periodRecordId`**
+
+3. **查询监审期间记录列表**
+   - 调用 `/listPeriodRecord` 查询已创建的监审期间记录列表
+
+4. **查询数据**
+   - 调用 `/getUploadData` 查询数据（可指定 `periodRecordId` 查询特定期间的数据）
+
+5. **删除监审期间记录**
+   - 调用 `/deletePeriodRecord` 删除监审期间记录
+

assistMg/src/main/java/com/hotent/enterpriseDeclare/controller/opinion/CostAuditTaskInfoController.java

@@ -10,8 +10,8 @@ import com.hotent.enterpriseDeclare.manager.CostSurveyTemplateUploadDataManager;
 import com.hotent.enterpriseDeclare.model.CostAuditPeriodRecord;
 import com.hotent.enterpriseDeclare.model.CostSurveyTemplateUploadData;
 import com.hotent.surveyinfo.dao.CostSurveyTemplateItemsDao;
-import com.hotent.surveyinfo.manager.CostSurveyTemplateManager;
 import com.hotent.surveyinfo.manager.CostSurveyTemplateHeadersManager;
+import com.hotent.surveyinfo.manager.CostSurveyTemplateManager;
 import com.hotent.surveyinfo.manager.CostSurveyTemplateUploadManager;
 import com.hotent.surveyinfo.manager.CostSurveyTemplateVersionManager;
 import com.hotent.surveyinfo.model.CostSurveyTemplateHeaders;
@@ -26,7 +26,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Api(tags = "成本监审任务填报")
@@ -58,7 +61,7 @@ public class CostAuditTaskInfoController {
     private CostSurveyTemplateManager costSurveyTemplateManager;
 
     /**
-     * 企业报送-成本申报表-列表
+     * 企业报送-成本调查表-列表
      * @param catalogId 监管目录ID
      * @return 上传记录列表（包含是否必填、是否上传等信息）
      * @throws Exception
@@ -75,7 +78,7 @@ public class CostAuditTaskInfoController {
     }
 
     /**
-     * 企业报送-成本申报表-在线填报所需字段
+     * 企业报送-成本调查表-在线填报所需字段
      * @param surveyTemplateId 成本调查表id
      * @return 指标项数据列表（带key-value拼接）
      */
@@ -160,7 +163,7 @@ public class CostAuditTaskInfoController {
     }
 
     /**
-     * 企业报送-成本申报表-在线填报保持
+     * 企业报送-成本调查表-在线填报保持
      * @param dataList 数据列表（实体类列表，包含uploadId、auditedUnitId、rowid、rkey、rvalue等字段）
      * @return 保存结果
      */
@@ -209,7 +212,7 @@ public class CostAuditTaskInfoController {
     }
 
     /**
-     * 企业报送-成本申报表-在线填报记录查看
+     * 企业报送-成本调查表-在线填报记录查看
      * @param queryData 查询条件（实体类，包含uploadId和auditedUnitId）
      * @return 数据列表（实体类列表）
      */
@@ -223,13 +226,13 @@ public class CostAuditTaskInfoController {
             return CommonResult.<List<CostSurveyTemplateUploadData>>error().message("uploadId和auditedUnitId不能为空");
         }
 
-        List<CostSurveyTemplateUploadData> dataList = costSurveyTemplateUploadDataManager.listByUploadIdAndAuditedUnitId(queryData.getUploadId(), queryData.getAuditedUnitId());
+        List<CostSurveyTemplateUploadData> dataList = costSurveyTemplateUploadDataManager.
+                listByUploadIdAndAuditedUnitId(queryData.getUploadId(), queryData.getAuditedUnitId(),queryData.getPeriodRecordId());
         return CommonResult.<List<CostSurveyTemplateUploadData>>ok().value(dataList);
     }
 
     /**
-     * 企业报送-成本申报表-动态表-新增监审期间记录
-     * @param record 监审期间记录（包含uploadId、auditedUnitId、auditPeriod等字段）
+     * 企业报送-成本调查表-动态表-新增监审期间记录
      * @return 保存结果
      */
     @PostMapping(value = "/addPeriodRecord")
@@ -277,17 +280,12 @@ public class CostAuditTaskInfoController {
             record.setReportingTime(java.time.LocalDateTime.now());
         }
 
-        // 设置默认值
-        if (StringUtil.isEmpty(record.getIsDeleted())) {
-            record.setIsDeleted("0");
-        }
-
         costAuditPeriodRecordManager.createOrUpdate(record);
         return CommonResult.<CostAuditPeriodRecord>ok().value(record).message("新增监审期间记录成功");
     }
 
     /**
-     * 企业报送-成本申报表-动态表-查询监审期间记录列表
+     * 企业报送-成本调查表-动态表-查询监审期间记录列表
      * @param queryData 查询条件（包含uploadId和auditedUnitId）
      * @return 记录列表
      */
@@ -306,7 +304,7 @@ public class CostAuditTaskInfoController {
     }
 
     /**
-     * 企业报送-成本申报表-动态表-删除监审期间记录
+     * 企业报送-成本调查表-动态表-删除监审期间记录
      * @param id 记录ID
      * @return 删除结果
      */
@@ -323,5 +321,16 @@ public class CostAuditTaskInfoController {
         costAuditPeriodRecordManager.remove(id);
         return CommonResult.<String>ok().message("删除监审期间记录成功");
     }
+
+    /**
+     * 企业报送-成本调查表-审核
+     * @return
+     * @exception
+     */
+    @PostMapping(value="/review")
+    public CommonResult<String> review(@RequestBody CostSurveyTemplateUpload costProjectTaskMaterial){
+        costSurveyTemplateUploadManager.updateById(costProjectTaskMaterial);
+        return CommonResult.<String>ok();
+    }
 }
 

assistMg/src/main/java/com/hotent/enterpriseDeclare/dao/CostSurveyTemplateUploadDataDao.java

@@ -30,7 +30,9 @@ public interface CostSurveyTemplateUploadDataDao extends BaseMapper<CostSurveyTe
      */
     List<CostSurveyTemplateUploadData> selectByUploadIdAndAuditedUnitId(
             @Param("uploadId") String uploadId,
-            @Param("auditedUnitId") String auditedUnitId);
+            @Param("auditedUnitId") String auditedUnitId,
+            @Param("periodRecordId") String periodRecordId
+    );
     
     /**
      * 根据行数据ID查询数据列表

assistMg/src/main/java/com/hotent/enterpriseDeclare/manager/CostSurveyTemplateUploadDataManager.java

@@ -41,7 +41,7 @@ public interface CostSurveyTemplateUploadDataManager extends BaseManager<CostSur
      * @param auditedUnitId 企业ID
      * @return 数据列表
      */
-    List<CostSurveyTemplateUploadData> listByUploadIdAndAuditedUnitId(String uploadId, String auditedUnitId);
+    List<CostSurveyTemplateUploadData> listByUploadIdAndAuditedUnitId(String uploadId, String auditedUnitId,String periodRecordId);
     
     /**
      * 根据行数据ID查询数据列表

assistMg/src/main/java/com/hotent/enterpriseDeclare/manager/impl/CostSurveyTemplateUploadDataManagerImpl.java

@@ -51,8 +51,8 @@ public class CostSurveyTemplateUploadDataManagerImpl extends BaseManagerImpl<Cos
     }
 
     @Override
-    public List<CostSurveyTemplateUploadData> listByUploadIdAndAuditedUnitId(String uploadId, String auditedUnitId) {
-        return costSurveyTemplateUploadDataDao.selectByUploadIdAndAuditedUnitId(uploadId, auditedUnitId);
+    public List<CostSurveyTemplateUploadData> listByUploadIdAndAuditedUnitId(String uploadId, String auditedUnitId,String periodRecordId) {
+        return costSurveyTemplateUploadDataDao.selectByUploadIdAndAuditedUnitId(uploadId, auditedUnitId,periodRecordId);
     }
 
     @Override
@@ -78,23 +78,6 @@ public class CostSurveyTemplateUploadDataManagerImpl extends BaseManagerImpl<Cos
             throw new IllegalArgumentException("auditedUnitId不能为空");
         }
 
-        // 如果没有 uploadId，需要先创建主表
-        if (StringUtil.isEmpty(uploadId)) {
-            if (StringUtil.isEmpty(catalogId) || StringUtil.isEmpty(surveyTemplateId)) {
-                throw new IllegalArgumentException("创建主表时，catalogId和surveyTemplateId不能为空");
-            }
-
-            // 创建主表记录
-            CostSurveyTemplateUpload upload = new CostSurveyTemplateUpload();
-            upload.setCatalogId(catalogId);
-            upload.setSurveyTemplateId(surveyTemplateId);
-            upload.setIsRequired("1");
-            upload.setIsDeleted("0");
-            upload.setOrderNum(0);
-            costSurveyTemplateUploadManager.save(upload);
-            uploadId = upload.getId();
-        }
-
         // 获取periodRecordId（动态表使用）
         String periodRecordId = firstData.getPeriodRecordId();
         
@@ -134,6 +117,9 @@ public class CostSurveyTemplateUploadDataManagerImpl extends BaseManagerImpl<Cos
         if (!saveList.isEmpty()) {
             this.saveBatch(saveList);
         }
+        CostSurveyTemplateUpload upload = costSurveyTemplateUploadManager.getById(uploadId);
+        upload.setIsUpload("1");
+        costSurveyTemplateUploadManager.updateById(upload);
     }
 
 

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

@@ -20,6 +20,7 @@ import com.hotent.project.model.CostProjectApproval;
 import com.hotent.project.model.CostProjectTask;
 import com.hotent.project.model.CostProjectTaskPreliminaryOpinion;
 import com.hotent.project.model.CostProjectTaskProccess;
+import com.hotent.project.resp.CostProjectApprovalDetailResp;
 import com.hotent.uc.api.model.IUser;
 import com.hotent.uc.manager.UserManager;
 import com.hotent.uc.model.User;
@@ -165,10 +166,14 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
             List<CostProjectTask> childTasks = costProjectTaskManager.list(childQueryWrapper);
             for (CostProjectTask childTask : childTasks) {
                 childTask.setStatusName(TaskStatusConstant.getStatusNameByCode(childTask.getStatus()));
+                CostProjectApprovalDetailResp detail = costProjectApprovalManager.getDetail(childTask.getProjectId());
+                childTask.setCatalogId(detail.getCatalogId());
             }
             rootTask.setStatusName(TaskStatusConstant.getStatusNameByCode(rootTask.getStatus()));
             rootTask.setChildTasks(childTasks);
             rootTask.setCurrentNodeName(NodeConstant.getNodeValueByKey(rootTask.getCurrentNode()));
+            CostProjectApprovalDetailResp detail = costProjectApprovalManager.getDetail(rootTask.getProjectId());
+            rootTask.setCatalogId(detail.getCatalogId());
         }
 
         return result;

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

@@ -3,8 +3,11 @@ package com.hotent.project.manager.impl;
 import java.util.Arrays;
 import java.util.List;
 
+import com.hotent.surveyinfo.manager.CostSurveyFdTemplateManager;
+import com.hotent.surveyinfo.manager.CostSurveyTemplateManager;
 import com.hotent.sys.persistence.manager.DataDictManager;
 import com.hotent.sys.persistence.model.DataDict;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -31,6 +34,8 @@ public class CostProjectTaskMaterialManagerImpl extends BaseManagerImpl<CostProj
 
 	@Resource
 	DataDictManager dataDictManager;
+	@Autowired
+	private CostSurveyFdTemplateManager costSurveyFdTemplateManager;
 
 
 	@Override
@@ -72,6 +77,9 @@ public class CostProjectTaskMaterialManagerImpl extends BaseManagerImpl<CostProj
 			if (!BeanUtils.isEmpty(byDictKey)){
 				costProjectTaskMaterial.setInformationTypeName(byDictKey.getName());
 			}
+			if(costProjectTaskMaterial.getTemplateId() != null){
+				costProjectTaskMaterial.setTemplateType(costSurveyFdTemplateManager.getById(costProjectTaskMaterial.getTemplateId()).getTemplateType());
+			}
 
 		}
 

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

@@ -134,4 +134,7 @@ public class CostProjectTask extends BaseModel<CostProjectTask> {
     @JsonProperty("isGd")
     private String isGd;
 
+    @TableField(exist = false)
+    private String catalogId;
+
 }

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

@@ -90,6 +90,9 @@ public class CostProjectTaskMaterial extends BaseModel<CostProjectTaskMaterial>
     @JsonProperty("templateId")
     private String templateId;
 
+    @TableField(exist = false)
+    private String templateType;
+
     @ApiModelProperty(value = "创建时间")
     @TableField("create_time")
     @JsonProperty("createTime")
@@ -120,6 +123,15 @@ public class CostProjectTaskMaterial extends BaseModel<CostProjectTaskMaterial>
     @TableField("file_url")
     private String fileUrl;
 
+
+    public String getTemplateType() {
+        return templateType;
+    }
+
+    public void setTemplateType(String templateType) {
+        this.templateType = templateType;
+    }
+
     public String getId() {
         return id;
     }

assistMg/src/main/java/com/hotent/surveyinfo/controller/CostSurveyTemplateHeadersController.java

@@ -80,7 +80,7 @@ public class CostSurveyTemplateHeadersController extends BaseController<CostSurv
 	 */
 	@ApiOperation(value="根据成本调查表id和版本id获取表头数据列表", httpMethod = "GET", notes = "根据成本调查表id和版本号获取表头数据列表")
 	@GetMapping("/getlistBySurveyTemplateIdAndVersion")
-	public CommonResult<List<CostSurveyTemplateHeaders>> getlistBySurveyTemplateIdAndVersion(
+	public CommonResult<List<CostSurveyTemplateHeaders>> xgetlistBySurveyTemplateIdAndVersion(
 			@ApiParam(name="surveyTemplateId",value="成本调查表id", required = true) @RequestParam String surveyTemplateId,
 			@ApiParam(name="versionId",value="版本id", required = false) @RequestParam(required = false) String versionId) {
 

assistMg/src/main/java/com/hotent/surveyinfo/model/CostSurveyTemplateUpload.java

@@ -109,6 +109,32 @@ public class CostSurveyTemplateUpload extends BaseModel<CostSurveyTemplateUpload
     @JsonProperty("dataType")
     private String dataType;
 
+    @ApiModelProperty(value = "0未审核 1审核通过 2审核拒绝")
+    @TableField("audited_status")
+    @JsonProperty("auditedStatus")
+    private String auditedStatus;
+
+    @ApiModelProperty(value = "审核人")
+    @TableField("audited_user_id")
+    @JsonProperty("auditedUserId")
+    private String auditedUserId;
+
+    public String getAuditedStatus() {
+        return auditedStatus;
+    }
+
+    public void setAuditedStatus(String auditedStatus) {
+        this.auditedStatus = auditedStatus;
+    }
+
+    public String getAuditedUserId() {
+        return auditedUserId;
+    }
+
+    public void setAuditedUserId(String auditedUserId) {
+        this.auditedUserId = auditedUserId;
+    }
+
     public String getId() {
         return id;
     }

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

@@ -71,6 +71,9 @@
             upload_id = #{uploadId}
             AND audited_unit_id = #{auditedUnitId}
             AND is_deleted = '0'
+            <if test="periodRecordId != null">
+                AND period_record_id = #{periodRecordId}
+            </if>
         ORDER BY rowid, rkey
     </select>
 

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

@@ -20,13 +20,14 @@
         <result column="update_by" property="updateBy" />
         <!-- 关联查询字段 -->
         <result column="survey_template_name" property="surveyTemplateName" />
+        <result column="audited_status" property="auditedStatus" />
         <result column="template_type" property="templateType" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, catalog_id, survey_template_id, is_required, is_upload, upload_time, upload_by, 
-        file_url, order_num, is_deleted, create_time, create_by, update_time, update_by
+        file_url, order_num, is_deleted, create_time, create_by, update_time, update_by,audited_status
     </sql>
 
     <!-- 根据目录ID查询上传记录列表（关联模板信息） -->
@@ -48,18 +49,17 @@
             u.update_by,
             t.survey_template_name,
             t.template_type,
-            '模版定制' as data_type
+            '模版定制' as data_type,
+            u.audited_status
         FROM 
             cost_survey_template t
         LEFT JOIN 
             cost_survey_template_upload u ON t.survey_template_id = u.survey_template_id 
                 AND u.catalog_id = #{catalogId} 
-                AND u.is_deleted = '0'
-        WHERE 
+        WHERE
             t.catalog_id = #{catalogId}
             AND t.status = '0'
-            AND t.is_delete = '0'
-        ORDER BY 
+        ORDER BY
             COALESCE(u.order_num, 0) ASC, t.create_time ASC
     </select>