监审对象提交资料清单，成本调查表

assistMg/src/main/java/com/hotent/baseInfo/manager/impl/CostCatalogSurveyManagerImpl.java

@@ -4,29 +4,23 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hotent.baseInfo.model.CostCatalogSurvey;
-import com.hotent.baseInfo.model.CostCatalogSurvey;
+import com.hotent.base.manager.impl.BaseManagerImpl;
 import com.hotent.baseInfo.dao.CostCatalogSurveyDao;
 import com.hotent.baseInfo.manager.CostCatalogSurveyManager;
-import com.hotent.base.manager.impl.BaseManagerImpl;
+import com.hotent.baseInfo.model.CostCatalogSurvey;
 import com.hotent.baseInfo.req.CostBaseInfoPageReq;
 import com.hotent.baseInfo.resp.CostCatalogSurveyPageResp;
-import com.hotent.baseInfo.resp.CostCatalogSurveyPageResp;
-import com.hotent.config.EipConfig;
 import com.hotent.req.IdReq;
 import com.hotent.surveyinfo.manager.CostSurveyTemplateManager;
+import com.hotent.surveyinfo.model.CostSurveyTemplate;
 import com.hotent.uc.exception.BaseException;
 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;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
-import javax.annotation.Resource;
-
-import com.hotent.base.util.BeanUtils;
 
 
 /**
@@ -65,23 +59,29 @@ public class CostCatalogSurveyManagerImpl extends BaseManagerImpl<CostCatalogSur
         }
         LambdaQueryWrapper<CostCatalogSurvey> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(CostCatalogSurvey::getCatalogId, req.getCatalogId());
+        queryWrapper.orderByDesc(CostCatalogSurvey::getCreateTime);
 
         IPage<CostCatalogSurvey> page = new Page<>(req.getPageNum(), req.getPageSize());
         IPage<CostCatalogSurvey> respPage = this.page(page, queryWrapper);
-        List<String> ids = respPage.getRecords().stream().map(CostCatalogSurvey::getSurveyId).collect(Collectors.toList());
-        if(ObjectUtil.isEmpty(ids)){
+        List<CostCatalogSurvey> records = respPage.getRecords();
+        if(ObjectUtil.isEmpty(records)){
             return new Page<>();
         }
-        List<CostCatalogSurveyPageResp> respList = costSurveyTemplateManager.listByIds(ids).stream().map(item -> {
+        List<CostCatalogSurveyPageResp> respList = new ArrayList<>();
+        records.forEach(it ->{
+            CostSurveyTemplate costSurveyTemplate = costSurveyTemplateManager.getById(it.getSurveyId());
             CostCatalogSurveyPageResp CostCatalogSurveyPageResp = new CostCatalogSurveyPageResp();
-            CostCatalogSurveyPageResp.setSurveyId(item.getSurveyTemplateId().toString());
-            LocalDateTime createTime = item.getCreateTime();
-            CostCatalogSurveyPageResp.setYear(String.valueOf(createTime.getYear()));
-            CostCatalogSurveyPageResp.setStatus(item.getStatus());
-            CostCatalogSurveyPageResp.setTemplateType(item.getTemplateType());
-            CostCatalogSurveyPageResp.setSurveyTemplateName(item.getSurveyTemplateName());
-            return CostCatalogSurveyPageResp;
-        }).collect(Collectors.toList());
+            if (costSurveyTemplate != null) {
+                CostCatalogSurveyPageResp.setSurveyId(costSurveyTemplate.getSurveyTemplateId().toString());
+                LocalDateTime createTime = costSurveyTemplate.getCreateTime();
+                CostCatalogSurveyPageResp.setYear(String.valueOf(createTime.getYear()));
+                CostCatalogSurveyPageResp.setStatus(costSurveyTemplate.getStatus());
+                CostCatalogSurveyPageResp.setTemplateType(costSurveyTemplate.getTemplateType());
+                CostCatalogSurveyPageResp.setSurveyTemplateName(costSurveyTemplate.getSurveyTemplateName());
+            }
+            CostCatalogSurveyPageResp.setId(it.getId());
+            respList.add(CostCatalogSurveyPageResp);
+        });
 
         IPage<CostCatalogSurveyPageResp> resp = new Page<>(req.getPageNum(), req.getPageSize(), respPage.getTotal());
         resp.setRecords(respList);

assistMg/src/main/java/com/hotent/baseInfo/manager/impl/CostCatalogUnitManagerImpl.java

@@ -5,25 +5,21 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hotent.base.exception.BaseException;
-import com.hotent.baseInfo.model.CostCatalogUnit;
+import com.hotent.base.manager.impl.BaseManagerImpl;
 import com.hotent.baseInfo.dao.CostCatalogUnitDao;
 import com.hotent.baseInfo.manager.CostCatalogUnitManager;
-import com.hotent.base.manager.impl.BaseManagerImpl;
+import com.hotent.baseInfo.model.CostCatalogUnit;
 import com.hotent.baseInfo.req.CostBaseInfoPageReq;
 import com.hotent.surveyinfo.manager.CostSurveyFdTemplateManager;
 import com.hotent.surveyinfo.model.CostSurveyFdTemplate;
 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;
 
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import javax.annotation.Resource;
-
-import com.hotent.base.util.BeanUtils;
 
 
 /**
@@ -84,8 +80,10 @@ public class CostCatalogUnitManagerImpl extends BaseManagerImpl<CostCatalogUnitD
         records.forEach(costCatalogUnit -> {
             if ("3".equals(costCatalogUnit.getFormatRequired())) {
                 if(fdTemplateMap!=null) {
-                    CostSurveyFdTemplate costSurveyFdTemplate = fdTemplateMap.get(costCatalogUnit.getTemplateId());
-                    costCatalogUnit.setSurveyTemplateName(costSurveyFdTemplate.getSurveyTemplateName());
+                    if (fdTemplateMap.containsKey(costCatalogUnit.getTemplateId())) {
+                        CostSurveyFdTemplate costSurveyFdTemplate = fdTemplateMap.get(costCatalogUnit.getTemplateId());
+                        costCatalogUnit.setSurveyTemplateName(costSurveyFdTemplate.getSurveyTemplateName());
+                    }
                 }else{
                     costCatalogUnit.setSurveyTemplateName("-");
                 }

assistMg/src/main/java/com/hotent/baseInfo/model/CostCatalog.java

@@ -3,14 +3,14 @@ package com.hotent.baseInfo.model;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.hotent.base.entity.BaseModel;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.hotent.base.entity.BaseModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
 /**
  * 成本监审目录表
  *
@@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @since 2025-09-19
  */
 @ApiModel(value="CostCatalog对象", description="成本监审目录表")
-public class    CostCatalog extends BaseModel<CostCatalog> {
+public class CostCatalog extends BaseModel<CostCatalog> {
 
     private static final long serialVersionUID = 1L;
     @ApiModelProperty(value = "主键")

assistMg/src/main/java/com/hotent/baseInfo/resp/CostCatalogSurveyPageResp.java

@@ -1,17 +1,12 @@
 package com.hotent.baseInfo.resp;
 
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDateTime;
-
 @ApiModel(value = "监审目录-成本调查表", description = "监审目录-成本调查表")
 @Data
 public class CostCatalogSurveyPageResp {
@@ -40,7 +35,7 @@ public class CostCatalogSurveyPageResp {
 
 
 
-
+    private String id;