1消息通知接口返回单位名称字段

assistMg/src/main/java/com/hotent/baseInfo/manager/AuditedUnitManager.java

@@ -30,6 +30,8 @@ public interface AuditedUnitManager extends BaseManager<AuditedUnit> {
     List<AuditedUnit> getList(String unitId) throws Exception;
 
     List<AuditedUnit> getByUserAccount(String account);
+
+    List<AuditedUnit> getByIds(List<String> list);
 }
 
 

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

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.Collections;
 import java.util.List;
 
 @Service
@@ -161,6 +162,13 @@ public class AuditedUnitManagerImpl extends BaseManagerImpl<AuditedUnitDao, Audi
         wrapper.eq("account",account);
         return this.list(wrapper);
     }
+
+    @Override
+    public List<AuditedUnit> getByIds(List<String> list) {
+        QueryWrapper<AuditedUnit> wrapper = new QueryWrapper<>();
+        wrapper.in("unit_id",list);
+        return this.list(wrapper);
+    }
 }
 
 

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

@@ -5,6 +5,7 @@ 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.manager.AuditedUnitManager;
+import com.hotent.baseInfo.model.AuditedUnit;
 import com.hotent.baseInfo.resp.AuditedUnitDetailResp;
 import com.hotent.constant.BaseConstant;
 import com.hotent.project.model.CostNotice;
@@ -25,6 +26,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import com.hotent.base.util.BeanUtils;
 
@@ -100,7 +103,23 @@ public class CostNoticeManagerImpl extends BaseManagerImpl<CostNoticeDao, CostNo
 //		}
 		qw.orderByDesc(CostNotice::getCreateTime);
 		IPage<CostNotice> page=new Page<>(req.getPageNum(), req.getPageSize());
-		return this.page(page, qw);
+		IPage<CostNotice> costNoticeIPage = this.page(page, qw);
+		List<CostNotice> records = costNoticeIPage.getRecords();
+		List<String> list = records.stream().map(CostNotice::getEnterpriseId).distinct().collect(Collectors.toList());
+		List<AuditedUnit> units=auditedUnitManager.getByIds(list);
+		Map<String, String> unitIdToNameMap = units.stream()
+				.collect(Collectors.toMap(
+						AuditedUnit::getUnitId,
+						AuditedUnit::getUnitName,
+						(existing, replacement) -> existing  // 如果有重复键，保留第一个
+				));
+		records.forEach(r -> {
+			String unitName = unitIdToNameMap.get(r.getEnterpriseId());
+			if (unitName != null) {
+				r.setEnterpriseName(unitName);
+			}
+		});
+		return page;
 	}
 
 	@Override