fix: 模版保存以及别名配置增加备案编码搜索

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

@@ -21,7 +21,7 @@ public interface EmailFundAssetMapper {
 
     void deleteByFileId(@Param("fileId") Integer fileId);
 
-    List<EmailFundAssetDO> selectNotMappingAsset(@Param("fundName") String sourceFundName);
+    List<EmailFundAssetDO> selectNotMappingAsset(@Param("fundName") String sourceFundName,@Param("registerNumber")String registerNumber);
 
     void batchUpdate(@Param("itemDoList")List<EmailFundAssetDO> fundAssetDOList);
 

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

@@ -20,11 +20,11 @@ public interface EmailFundNavMapper {
 
     Integer countNoStoreNav(@Param("fundName") String sourceFundName,@Param("registerNumber") String registerNumber);
 
-    List<Integer> selectFileIdByFundName(@Param("fundName") String sourceFundName);
+    List<Integer> selectFileIdByFundName(@Param("fundName") String sourceFundName,@Param("registerNumber") String registerNumber);
 
     void deleteByFileId(@Param("fileId") Integer fileId);
 
-    List<EmailFundNavDO> selectNotMappingNav(@Param("fundName") String sourceFundName);
+    List<EmailFundNavDO> selectNotMappingNav(@Param("fundName") String sourceFundName,@Param("registerNumber") String registerNumber);
 
     void batchUpdate(@Param("navList") List<EmailFundNavDO> fundNavDOList);
 

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

@@ -177,7 +177,12 @@
                         updatetime
         from PPW_EMAIL.email_fund_asset
         where isvalid =1 and exception_status=3
-          and fund_name=#{fundName}
+        <if test="fundName != null and fundName !=''">
+            and fund_name=#{fundName}
+        </if>
+        <if test="registerNumber != null and registerNumber !=''">
+            and register_number=#{registerNumber}
+        </if>
     </select>
     <resultMap id="BaseDetailMap" type="com.simuwang.base.pojo.dos.EmailParseDetailDO">
         <result column="fund_id" property="fundId"/>

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

@@ -175,8 +175,13 @@
         </if>
     </select>
     <select id="selectFileIdByFundName" resultType="java.lang.Integer" parameterType="java.lang.String">
-        select distinct nav.file_id from PPW_EMAIL.email_fund_nav nav where nav.isvalid =1 and nav.exception_status=3
+        select distinct nav.file_id from PPW_EMAIL.email_fund_nav nav where nav.isvalid =1 and nav.exception_status in(1,3)
+        <if test="fundName != null and fundName != ''">
             and nav.fund_name=#{fundName}
+        </if>
+        <if test="registerNumber != null and registerNumber != ''">
+            and nav.register_number=#{registerNumber}
+        </if>
     </select>
     <select id="selectNotMappingNav" resultMap="BaseResultMap"
             parameterType="java.lang.String">
@@ -196,8 +201,14 @@
                nav.updatetime,
                nav.createtime
         from PPW_EMAIL.email_fund_nav nav
-        where nav.isvalid =1 and nav.exception_status=3
-          and nav.fund_name=#{fundName}
+        where nav.isvalid =1 and nav.exception_status in (1,3)
+        <if test="fundName != null and fundName != ''">
+            and nav.fund_name=#{fundName}
+        </if>
+        <if test="registerNumber != null and registerNumber != ''">
+            and nav.register_number=#{registerNumber}
+        </if>
+        order by nav.updatetime desc
     </select>
     <select id="getMaxPriceDate" resultType="java.lang.String" parameterType="java.lang.String">
         select max(nav.price_date) from PPW_EMAIL.email_fund_nav nav where nav.isvalid =1 and nav.exception_status=3

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

@@ -29,7 +29,7 @@
         </foreach>
     </update>
     <update id="updateTemplateInfo">
-        update PPW_EMAIL.email_template_info set name=#{name},type=#{type},description=#{description},status=#{status},updatetime=#{updateTime},updaterid=#{updaterId}
+        update PPW_EMAIL.email_template_info set name=#{name},type=#{type},direction=#{direction},description=#{description},status=#{status},updatetime=#{updateTime},updaterid=#{updaterId}
         where id=#{id} and isvalid=1
     </update>
     <select id="searchTemplateList" resultMap="BaseResultMap">

service-manage/src/main/java/com/simuwang/manage/service/EmailFundAssetService.java

@@ -7,5 +7,5 @@ package com.simuwang.manage.service;
  * Description: ${DESCRIPTION}
  */
 public interface EmailFundAssetService {
-    void reparseFileAsset(String sourceFundName, String targetFundId);
+    void reparseFileAsset(String sourceFundName,String registerNumber, String targetFundId);
 }

service-manage/src/main/java/com/simuwang/manage/service/EmailFundInfoService.java

@@ -15,5 +15,5 @@ import java.util.List;
 public interface EmailFundInfoService {
     MybatisPage<FundFileInfoVO> searchFundFileInfo(FundFilePageQuery fundFilePageQuery);
 
-    void reparseValuationFile(String sourceFundName);
+    void reparseValuationFile(String sourceFundName,String registerNumber);
 }

service-manage/src/main/java/com/simuwang/manage/service/EmailFundNavService.java

@@ -7,5 +7,5 @@ package com.simuwang.manage.service;
  * Description: ${DESCRIPTION}
  */
 public interface EmailFundNavService {
-    void reparseFileNav(String sourceFundName, String targetFundId);
+    void reparseFileNav(String sourceFundName,String registerNumber, String targetFundId);
 }

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

@@ -35,8 +35,8 @@ public class EmailFundAssetServiceImpl implements EmailFundAssetService {
     private EmailParseService emailParseService;
 
     @Override
-    public void reparseFileAsset(String sourceFundName, String targetFundId) {
-        List<EmailFundAssetDO> fundAssetDOList = emailFundAssetMapper.selectNotMappingAsset(sourceFundName);
+    public void reparseFileAsset(String sourceFundName,String registerNumber, String targetFundId) {
+        List<EmailFundAssetDO> fundAssetDOList = emailFundAssetMapper.selectNotMappingAsset(sourceFundName,registerNumber);
         Map<String,List<EmailFundAssetDO>> fundAssetDOGroup = fundAssetDOList.stream().collect(Collectors.groupingBy(e -> DateUtils.format(e.getPriceDate(),DateUtils.YYYY_MM_DD)));
         List<EmailFundAssetDO> dataList = new ArrayList<>();
         //去重

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

@@ -34,8 +34,8 @@ public class EmailFundNavServiceImpl implements EmailFundNavService {
     private EmailParseService emailParseService;
 
     @Override
-    public void reparseFileNav(String sourceFundName, String targetFundId) {
-        List<EmailFundNavDO> fundNavDOList = emailFundNavMapper.selectNotMappingNav(sourceFundName);
+    public void reparseFileNav(String sourceFundName,String registerNumber, String targetFundId) {
+        List<EmailFundNavDO> fundNavDOList = emailFundNavMapper.selectNotMappingNav(sourceFundName,registerNumber);
         Map<String,List<EmailFundNavDO>> fundNavDOGroup = fundNavDOList.stream().collect(Collectors.groupingBy(e -> DateUtils.format(e.getPriceDate(),DateUtils.YYYY_MM_DD)));
         List<EmailFundNavDO> dataList = new ArrayList<>();
         //去重
@@ -57,6 +57,8 @@ public class EmailFundNavServiceImpl implements EmailFundNavService {
                     .map(e -> BeanUtil.copyProperties(e, NavDO.class)).collect(Collectors.toList());
             navDOList.forEach(e -> e.setUpdateTime(DateUtils.getNowDate()));
             emailParseService.saveNavDo(navDOList);
+
+
         }
     }
 }

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

@@ -94,11 +94,11 @@ public class FundAliasServiceImpl implements FundAliasService {
         fundAliasDO.setUpdateTime(new Date());
         fundAliasMapper.saveFundAlias(fundAliasDO);
         //将采集的净值数据匹配之后重新入库
-        emailFileNavService.reparseFileNav(fundAliasVO.getSourceFundName(),fundAliasVO.getTargetFundId());
+        emailFileNavService.reparseFileNav(fundAliasVO.getSourceFundName(),fundAliasVO.getSourceRegisterNumber(),fundAliasVO.getTargetFundId());
         //将采集的规模数据匹配之后重新入库
-        emailFundAssetService.reparseFileAsset(fundAliasVO.getSourceFundName(),fundAliasVO.getTargetFundId());
+        emailFundAssetService.reparseFileAsset(fundAliasVO.getSourceFundName(),fundAliasVO.getSourceRegisterNumber(),fundAliasVO.getTargetFundId());
         //处理采集数据，将采集的数据入库
-        emailFundInfoService.reparseValuationFile(fundAliasVO.getSourceFundName());
+        emailFundInfoService.reparseValuationFile(fundAliasVO.getSourceFundName(),fundAliasVO.getSourceRegisterNumber());
     }
 
     @Override