feat: 基金列表增加ID返回

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

@@ -150,10 +150,16 @@ public class FundInfoDO {
      */
     private String advisorCompanyName;
     /**
-     * 发行人名称
+     * 管理人名称
      */
     private String trustCompanyName;
 
+    /**
+     * 发行人公司
+     * @return
+     */
+    private String issuerCompanyName;
+
     public FundInfoVO toVO() {
         FundInfoVO vo = new FundInfoVO();
         vo.setId(this.id);
@@ -162,6 +168,7 @@ public class FundInfoDO {
         vo.setInceptionDate(this.inceptionDate);
         vo.setAdvisorId(this.advisorId);
         vo.setIssuerId(this.issuerId);
+        vo.setIssuerCompanyName(this.issuerCompanyName);
         vo.setTrustCompanyName(this.trustCompanyName);
         vo.setBaseCurrency(this.baseCurrency);
         vo.setFundName(this.fundName);

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

@@ -12,6 +12,10 @@ import lombok.Data;
 @Data
 public class FundInformationDO {
     /**
+     * ID
+     */
+    private Integer id;
+    /**
      * 基金ID
      */
     private String fundId;
@@ -66,6 +70,7 @@ public class FundInformationDO {
 
     public FundInformationVO toVO() {
         FundInformationVO vo = new FundInformationVO();
+        vo.setId(this.id);
         vo.setFundId(this.fundId);
         vo.setFundShortName(this.fundShortName);
         vo.setRegisterNumber(this.registerNumber);

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

@@ -60,11 +60,16 @@ public class FundInfoVO {
      */
     private String issuerId;
     /**
+     * 发行人公司
+     * @return
+     */
+    private String issuerCompanyName;
+    /**
      * 投资顾问名称
      */
     private String advisorCompanyName;
     /**
-     * 发行人名称
+     * 管理人名称
      */
     private String trustCompanyName;
     /**

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

@@ -73,7 +73,7 @@
                 and epi.parse_date <![CDATA[ <= ]]> #{endDate}
             </if>
             <if test="emailStartDate !=null and emailStartDate != ''">
-                and epi.email_date <![CDATA[ >= ]]> #{startDate}
+                and epi.email_date <![CDATA[ >= ]]> #{emailStartDate}
             </if>
             <if test="emailEndDate !=null and emailEndDate != ''">
                 and epi.email_date <![CDATA[ <= ]]> #{emailEndDate}

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

@@ -12,6 +12,7 @@
         <result column="inception_date" property="inceptionDate"/>
         <result column="advisor_id" property="advisorId"/>
         <result column="issuer_id" property="issuerId"/>
+        <result column="issuer_company_name" property="issuerCompanyName"/>
         <result column="advisor_company_name" property="advisorCompanyName"/>
         <result column="custodian_id" property="custodianId"/>
         <result column="register_number" property="registerNumber"/>
@@ -41,7 +42,8 @@
     </select>
     <select id="searchFundInfoList" resultType="com.simuwang.base.pojo.dos.FundInformationDO">
         select * from (
-        select f.fund_id as fundId,
+        select f.id as id,
+               f.fund_id as fundId,
                f.fund_short_name as fundShortName,
                f.register_number as registerNumber,
                c.company_id as companyId,
@@ -199,16 +201,18 @@
         select info.id,info.p_fund_id,info.fund_id,info.fund_name,
                info.fund_short_name,info.fund_type,info.manager_type,
                info.base_currency,info.inception_date,info.advisor_id,a.company_name as advisor_company_name,
-               info.issuer_id,t.company_name as trust_company_name,info.custodian_id,info.trust_id,
+               info.issuer_id,ic.company_name as issuer_company_name,t.company_name as trust_company_name,info.custodian_id,info.trust_id,
                info.register_number,info.register_date,info.createtime,
                info.is_amac_show,info.fund_status,info.amac_source_type,
                info.investment_type,info.liquidate_date,info.performance_start_date,
                info.is_shareclass,info.amac_url
         from PPW_EMAIL.pvn_fund_info info
         left join PPW_EMAIL.pvn_company_info a
-        on info.advisor_id = a.company_id and a.isvalid=1
+                  on info.advisor_id = a.company_id and a.isvalid=1
         left join PPW_EMAIL.pvn_company_info t
                   on info.trust_id = t.company_id and t.isvalid=1
+        left join PPW_EMAIL.pvn_company_info ic
+                  on info.issuer_id = ic.company_id and ic.isvalid=1
         where info.isvalid=1 and info.fund_id=#{fundId}
     </select>
 </mapper>