1
0
فهرست منبع

fix: 基金查询搜索调整返回结构

chenjianhua 7 ماه پیش
والد
کامیت
8ff178a5b1

+ 25 - 0
service-base/src/main/java/com/simuwang/base/pojo/vo/FundInfoSearchVO.java

@@ -0,0 +1,25 @@
+package com.simuwang.base.pojo.vo;
+
+import lombok.Data;
+
+/**
+ * FileName: FundInfoSearchVO
+ * Author:   chenjianhua
+ * Date:     2024/9/18 17:54
+ * Description: ${DESCRIPTION}
+ */
+@Data
+public class FundInfoSearchVO {
+    /**
+     * 基金ID
+     */
+    private String fundId;
+    /**
+     * 基金名称
+     */
+    private String fundName;
+    /**
+     * 备案编码
+     */
+    private String registerNumber;
+}

+ 3 - 2
service-manage/src/main/java/com/simuwang/manage/api/fund/FundInformationController.java

@@ -5,6 +5,7 @@ import com.simuwang.base.pojo.dto.query.FundFilePageQuery;
 import com.simuwang.base.pojo.dto.query.FundInfoPageQuery;
 import com.simuwang.base.pojo.dto.query.FundInputPageQuery;
 import com.simuwang.base.pojo.vo.FundFileInfoVO;
+import com.simuwang.base.pojo.vo.FundInfoSearchVO;
 import com.simuwang.base.pojo.vo.FundInformationVO;
 import com.simuwang.base.pojo.vo.FundReportFrequencyVO;
 import com.simuwang.manage.service.EmailFundInfoService;
@@ -43,8 +44,8 @@ public class FundInformationController{
      * @return
      */
     @RequestMapping("search-info")
-    public MybatisPage<Map<String,String>> searchFundInfo(FundInputPageQuery fundInputPageQuery){
-        MybatisPage<Map<String,String>> result = fundInformationService.searchFundInfo(fundInputPageQuery);
+    public MybatisPage<FundInfoSearchVO> searchFundInfo(FundInputPageQuery fundInputPageQuery){
+        MybatisPage<FundInfoSearchVO> result = fundInformationService.searchFundInfo(fundInputPageQuery);
         return result;
     }
 

+ 2 - 1
service-manage/src/main/java/com/simuwang/manage/service/FundInformationService.java

@@ -3,6 +3,7 @@ package com.simuwang.manage.service;
 import com.simuwang.base.common.support.MybatisPage;
 import com.simuwang.base.pojo.dto.query.FundInfoPageQuery;
 import com.simuwang.base.pojo.dto.query.FundInputPageQuery;
+import com.simuwang.base.pojo.vo.FundInfoSearchVO;
 import com.simuwang.base.pojo.vo.FundInformationVO;
 
 import java.util.List;
@@ -15,7 +16,7 @@ import java.util.Map;
  * Description: ${DESCRIPTION}
  */
 public interface FundInformationService {
-    MybatisPage<Map<String,String>> searchFundInfo(FundInputPageQuery fundInputPageQuery);
+    MybatisPage<FundInfoSearchVO> searchFundInfo(FundInputPageQuery fundInputPageQuery);
 
     MybatisPage<FundInformationVO> searchFundInfoList(FundInfoPageQuery fundInfoPageQuery);
 }

+ 12 - 2
service-manage/src/main/java/com/simuwang/manage/service/impl/FundInformationServiceImpl.java

@@ -4,11 +4,13 @@ import com.simuwang.base.common.support.MybatisPage;
 import com.simuwang.base.mapper.FundInfoMapper;
 import com.simuwang.base.pojo.dto.query.FundInfoPageQuery;
 import com.simuwang.base.pojo.dto.query.FundInputPageQuery;
+import com.simuwang.base.pojo.vo.FundInfoSearchVO;
 import com.simuwang.base.pojo.vo.FundInformationVO;
 import com.simuwang.manage.service.FundInformationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -23,10 +25,18 @@ public class FundInformationServiceImpl implements FundInformationService {
     @Autowired
     private FundInfoMapper fundInfoMapper;
     @Override
-    public MybatisPage<Map<String,String>> searchFundInfo(FundInputPageQuery fundInputPageQuery) {
+    public MybatisPage<FundInfoSearchVO> searchFundInfo(FundInputPageQuery fundInputPageQuery) {
         List<Map<String,String>> fundInfoList = fundInfoMapper.searchFundInfoByKeyword(fundInputPageQuery);
+        List<FundInfoSearchVO> fundInfoSearchVOList = new ArrayList<>();
+        for(Map<String,String> map : fundInfoList){
+            FundInfoSearchVO vo = new FundInfoSearchVO();
+            vo.setFundId(map.get("fundId"));
+            vo.setFundName(map.get("fundShortName"));
+            vo.setRegisterNumber(map.get("registerNumber"));
+            fundInfoSearchVOList.add(vo);
+        }
         long total = fundInfoMapper.countFundInfoByKeyword(fundInputPageQuery);
-        return MybatisPage.of(total,fundInfoList);
+        return MybatisPage.of(total,fundInfoSearchVOList);
     }
 
     @Override