Merge branch 'develop' of http://112.74.196.215:3000/Tech2/data-daq into develop

service-base/src/main/java/com/simuwang/base/mapper/FundInfoMapper.java

@@ -2,6 +2,7 @@ package com.simuwang.base.mapper;
 
 import com.simuwang.base.pojo.dos.FundAndCompanyInfoDO;
 import com.simuwang.base.pojo.dos.FundInfoDO;
+import com.simuwang.base.pojo.dos.FundInformationDO;
 import com.simuwang.base.pojo.dto.query.FundInfoPageQuery;
 import com.simuwang.base.pojo.dto.query.FundInputPageQuery;
 import com.simuwang.base.pojo.vo.FundInformationVO;
@@ -21,7 +22,7 @@ import java.util.Map;
 public interface FundInfoMapper {
     List<Map<String, String>> searchFundInfoByKeyword(FundInputPageQuery fundInputPageQuery);
 
-    List<FundInformationVO> searchFundInfoList(FundInfoPageQuery fundInfoPageQuery);
+    List<FundInformationDO> searchFundInfoList(FundInfoPageQuery fundInfoPageQuery);
 
     List<FundInfoDO> queryFundByNameAndRegisterNumber(@Param("fundName")String fundName, @Param("registerNumber")String registerNumber);
 

service-base/src/main/java/com/simuwang/base/pojo/dos/FundInformationDO.java

@@ -0,0 +1,79 @@
+package com.simuwang.base.pojo.dos;
+
+import com.simuwang.base.pojo.vo.FundInformationVO;
+import lombok.Data;
+
+/**
+ * FileName: FundInformationDO
+ * Author:   chenjianhua
+ * Date:     2024/10/11 14:19
+ * Description: ${DESCRIPTION}
+ */
+@Data
+public class FundInformationDO {
+    /**
+     * 基金ID
+     */
+    private String fundId;
+    /**
+     * 基金简称
+     */
+    private String fundShortName;
+    /**
+     * 备案编码
+     */
+    private String registerNumber;
+    /**
+     * 管理ID
+     */
+    private String companyId;
+    /**
+     * 管理人
+     */
+    private String companyName;
+    /**
+     * 管理人
+     */
+    private String creditCode;
+    /**
+     * 基金成立日期
+     */
+    private String inceptionDate;
+    /**
+     * 最新净值日期
+     */
+    private String lastPriceDate;
+    /**
+     * 净值报送频率，1-日频，2-周频，3-月频，4-季频，5-半年，6-年频
+     */
+    private Integer navFrequency;
+    /**
+     * 规模报送频率，1-日频，2-周频，3-月频，4-季频，5-半年，6-年频
+     */
+    private Integer assetFrequency;
+    /**
+     * 估值报送频率，1-日频，2-周频，3-月频，4-季频，5-半年，6-年频
+     */
+    private Integer valuationFrequency;
+    /**
+     * 规模备注
+     */
+    private String frequencyRemark;
+
+    public FundInformationVO toVO() {
+        FundInformationVO vo = new FundInformationVO();
+        vo.setFundId(this.fundId);
+        vo.setFundShortName(this.fundShortName);
+        vo.setRegisterNumber(this.registerNumber);
+        vo.setCompanyId(this.companyId);
+        vo.setCompanyName(this.companyName);
+        vo.setCreditCode(this.creditCode);
+        vo.setNavFrequency(this.navFrequency);
+        vo.setAssetFrequency(this.assetFrequency);
+        vo.setValuationFrequency(this.valuationFrequency);
+        vo.setFrequencyRemark(this.frequencyRemark);
+        vo.setInceptionDate(this.inceptionDate);
+        vo.setLastPriceDate(this.lastPriceDate);
+        return vo;
+    }
+}

service-base/src/main/java/com/simuwang/base/pojo/dos/FundReportFrequencyDO.java

@@ -38,6 +38,11 @@ public class FundReportFrequencyDO {
     @TableField(value = "asset_frequency")
     private Integer assetFrequency;
     /**
+     * 估值报送频率，1-日频，2-周频，3-月频，4-季频，5-半年，6-年频,-1无固定
+     */
+    @TableField(value = "valuation_frequency")
+    private Integer valuationFrequency;
+    /**
      * 频率备注
      */
     @TableField(value = "frequency_remark")

service-base/src/main/java/com/simuwang/base/pojo/dto/query/FundInfoPageQuery.java

@@ -31,6 +31,10 @@ public class FundInfoPageQuery extends PageQuery {
      */
     private Integer assetFrequency;
     /**
+     * 规模报送频率
+     */
+    private Integer valuationFrequency;
+    /**
      * 成立日期开始时间
      */
     private String startDate;
@@ -94,4 +98,12 @@ public class FundInfoPageQuery extends PageQuery {
     public void setEndDate(String endDate) {
         this.endDate = endDate;
     }
+
+    public Integer getValuationFrequency() {
+        return valuationFrequency;
+    }
+
+    public void setValuationFrequency(Integer valuationFrequency) {
+        this.valuationFrequency = valuationFrequency;
+    }
 }

service-base/src/main/java/com/simuwang/base/pojo/vo/FundInformationVO.java

@@ -20,9 +20,21 @@ public class FundInformationVO {
      */
     private String fundShortName;
     /**
+     * 备案编码
+     */
+    private String registerNumber;
+    /**
+     * 管理ID
+     */
+    private String companyId;
+    /**
      * 管理人
      */
-    private String companyShortName;
+    private String companyName;
+    /**
+     * 管理人
+     */
+    private String creditCode;
     /**
      * 基金成立日期
      */
@@ -40,6 +52,10 @@ public class FundInformationVO {
      */
     private Integer assetFrequency;
     /**
+     * 估值报送频率，1-日频，2-周频，3-月频，4-季频，5-半年，6-年频
+     */
+    private Integer valuationFrequency;
+    /**
      * 规模备注
      */
     private String frequencyRemark;

service-base/src/main/java/com/simuwang/base/pojo/vo/FundReportFrequencyVO.java

@@ -28,6 +28,10 @@ public class FundReportFrequencyVO {
      */
     private Integer assetFrequency;
     /**
+     * 估值报送频率，1-日频，2-周频，3-月频，4-季频，5-半年，6-年频,-1无固定
+     */
+    private Integer valuationFrequency;
+    /**
      * 频率备注
      */
     private String frequencyRemark;

service-base/src/main/resources/mapper/FundInfoMapper.xml

@@ -37,15 +37,19 @@
         </if>
         limit #{offset},#{pageSize}
     </select>
-    <select id="searchFundInfoList" resultType="com.simuwang.base.pojo.vo.FundInformationVO">
+    <select id="searchFundInfoList" resultType="com.simuwang.base.pojo.dos.FundInformationDO">
         select * from (
         select f.fund_id as fundId,
                f.fund_short_name as fundShortName,
-               c.company_short_name as companyShortName,
+               f.register_number as registerNumber,
+               c.company_id as companyId,
+               c.company_name as companyName,
+               c.credit_code as creditCode,
                f.inception_date as inceptionDate,
                ifnull(n.last_price_date,'') as lastPriceDate,
                r.nav_frequency as navFrequency,
                r.asset_Frequency as assetFrequency,
+               r.valuation_Frequency as valuationFrequency,
                r.frequency_remark as frequencyRemark
         from PPW_EMAIL.pvn_fund_info f
         join PPW_EMAIL.pvn_company_info c on f.trust_id = c.company_id
@@ -68,6 +72,9 @@
         <if test="assetFrequency != null and assetFrequency !=''">
             and r.asset_Frequency = #{assetFrequency}
         </if>
+        <if test="valuationFrequency != null and valuationFrequency !=''">
+            and r.valuation_Frequency = #{valuationFrequency}
+        </if>
         <if test="startDate != null and startDate !=''">
             and f.inception_date <![CDATA[ >= ]]> #{startDate}
         </if>
@@ -137,6 +144,9 @@
         <if test="assetFrequency != null and assetFrequency !=''">
             and r.asset_Frequency = #{assetFrequency}
         </if>
+        <if test="valuationFrequency != null and valuationFrequency !=''">
+            and r.valuation_Frequency = #{valuationFrequency}
+        </if>
         <if test="startDate != null and startDate !=''">
             and f.inception_date <![CDATA[ >= ]]> #{startDate}
         </if>

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

@@ -2,6 +2,7 @@ package com.simuwang.manage.service.impl;
 
 import com.simuwang.base.common.support.MybatisPage;
 import com.simuwang.base.mapper.FundInfoMapper;
+import com.simuwang.base.pojo.dos.FundInformationDO;
 import com.simuwang.base.pojo.dto.query.FundInfoPageQuery;
 import com.simuwang.base.pojo.dto.query.FundInputPageQuery;
 import com.simuwang.base.pojo.vo.FundInfoSearchVO;
@@ -13,6 +14,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * FileName: FundInformationServiceImpl
@@ -41,8 +43,9 @@ public class FundInformationServiceImpl implements FundInformationService {
 
     @Override
     public MybatisPage<FundInformationVO> searchFundInfoList(FundInfoPageQuery fundInfoPageQuery) {
-        List<FundInformationVO> result = fundInfoMapper.searchFundInfoList(fundInfoPageQuery);
+        List<FundInformationDO> result = fundInfoMapper.searchFundInfoList(fundInfoPageQuery);
+        List<FundInformationVO> fundInformationVOList = result.stream().map(FundInformationDO::toVO).collect(Collectors.toList());
         long total = fundInfoMapper.countFundInfo(fundInfoPageQuery);
-        return MybatisPage.of(total,result);
+        return MybatisPage.of(total,fundInformationVOList);
     }
 }

service-manage/src/main/java/com/simuwang/manage/service/impl/FundReportFrequencyServiceImpl.java

@@ -30,6 +30,7 @@ public class FundReportFrequencyServiceImpl implements FundReportFrequencyServic
             fundReportFrequencyDO.setFundId(fundId);
             fundReportFrequencyDO.setAssetFrequency(fundReportFrequency.getAssetFrequency());
             fundReportFrequencyDO.setNavFrequency(fundReportFrequency.getNavFrequency());
+            fundReportFrequencyDO.setValuationFrequency(fundReportFrequency.getValuationFrequency());
             fundReportFrequencyDO.setUpdateTime(new Date());
             fundReportFrequencyDO.setFrequencyRemark(fundReportFrequency.getFrequencyRemark());
             fundReportFrequencyDO.setCreatorId(UserUtils.getLoginUser().getUserId());