1.核定表

assistMg/src/main/java/com/hotent/enterpriseDeclare/controller/material/CostProjectTaskSurveyGenericController.java

@@ -1,5 +1,6 @@
 package com.hotent.enterpriseDeclare.controller.material;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hotent.base.annotation.ApiGroup;
 import com.hotent.base.constants.ApiGroupConsts;
@@ -208,7 +209,7 @@ public class CostProjectTaskSurveyGenericController {
     public CommonResult<String> saveUploadData(
             @ApiParam(name = "dataList", value = "数据列表", required = true)
             @RequestBody List<CostSurveyTemplateUploadData> dataList) throws Exception {
-
+        System.err.println(JSON.toJSON(dataList));
         if (dataList == null || dataList.isEmpty()) {
             return CommonResult.<String>error().message("数据列表不能为空");
         }
@@ -299,7 +300,7 @@ public class CostProjectTaskSurveyGenericController {
      * @return 数据列表
      */
     @PostMapping(value = "/getUploadData")
-    @ApiOperation(value = "查询调查表模板上传数据", httpMethod = "GET")
+    @ApiOperation(value = "查询调查表模板上传数据", httpMethod = "POST")
     public CommonResult<List<CostSurveyTemplateUploadData>> getUploadData(
             @ApiParam(name = "queryData", value = "查询条件", required = true)
             @RequestBody CostSurveyTemplateUploadData queryData) throws Exception {
@@ -308,12 +309,17 @@ public class CostProjectTaskSurveyGenericController {
             return CommonResult.<List<CostSurveyTemplateUploadData>>error().message("uploadId不能为空");
         }
 
+
+
         // 根据refId查询数据
         QueryWrapper<CostSurveyTemplateUploadData> wrapper = new QueryWrapper<>();
-        wrapper.eq("ref_id", queryData.getUploadId())
-               .eq("type", queryData.getType())
+        wrapper.eq("type", queryData.getType())
                .eq("is_deleted", "0");
-        
+        if (queryData.getType().equals("3")) {
+            wrapper.eq("task_id",queryData.getTaskId());
+        }else {
+            wrapper.eq("ref_id", queryData.getUploadId());
+        }
         // 如果指定了监审期间记录ID，添加过滤条件
         if (StringUtil.isNotEmpty(queryData.getPeriodRecordId())) {
             wrapper.eq("period_record_id", queryData.getPeriodRecordId());

assistMg/src/main/java/com/hotent/enterpriseDeclare/model/CostSurveyTemplateUploadData.java

@@ -34,7 +34,7 @@ public class CostSurveyTemplateUploadData extends BaseModel<CostSurveyTemplateUp
     @TableField(exist = false)
     private String uploadId;
     
-    @ApiModelProperty(value = "数据类型：1-成本调查表 2-财务数据表")
+    @ApiModelProperty(value = "数据类型：1-成本调查表 2-财务数据表 3-成本核定")
     @TableField("type")
     @JsonProperty("type")
     private String type;
@@ -102,6 +102,9 @@ public class CostSurveyTemplateUploadData extends BaseModel<CostSurveyTemplateUp
     @JsonProperty("surveyTemplateId")
     private String surveyTemplateId;
 
+    @ApiModelProperty(value = "子项目id")
+    @TableField("task_id")
+    @JsonProperty("taskId")
     private String taskId;
 
     public String getUploadId() {