fix(): 代码合并问题恢复

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

@@ -30,5 +30,5 @@ public interface EmailFileInfoMapper {
 
     void updateTimeById(@Param("id") Integer fileId, @Param("parseDate") Date parseDate);
 
-    List<String> selectValuationFileId(@Param("fileIdList") List<String> fileIdList);
+    List<Integer> selectValuationFileId(@Param("fileIdList") List<Integer> fileIdList);
 }

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

@@ -19,7 +19,7 @@ public interface EmailFundNavMapper {
 
     Integer countNoStoreNav(@Param("fundName") String sourceFundName);
 
-    List<String> selectFileIdByFundName(@Param("fundName") String sourceFundName);
+    List<Integer> selectFileIdByFundName(@Param("fundName") String sourceFundName);
 
     void deleteByFileId(@Param("fileId") Integer fileId);
 }

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

@@ -123,7 +123,7 @@
         WHERE efi.isvalid = 1
           AND efi.id =#{fileId}) a
     </select>
-    <select id="selectValuationFileId" resultType="java.lang.String"
+    <select id="selectValuationFileId" resultType="java.lang.Integer"
             parameterType="java.util.List">
         SELECT
             distinct file.id

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

@@ -30,6 +30,9 @@
             #{itemDo.isvalid}, #{itemDo.creatorId}, #{itemDo.createTime}, #{itemDo.updaterId}, #{itemDo.updateTime})
         </foreach>
     </insert>
+    <delete id="deleteByFileId" parameterType="java.lang.Integer">
+        update PPW_EMAIL.email_fund_nav nav set isvalid = 0,updatetime=sysdate() where file_id=#{fileId}
+    </delete>
     <select id="searchNavDetail" resultMap="BaseResultMap">
         SELECT distinct nav.id,
             nav.fund_id,
@@ -113,7 +116,7 @@
         where isvalid =1 and exception_status=3
             and fund_name=#{fundName}
     </select>
-    <select id="selectFileIdByFundName" resultType="java.lang.String" parameterType="java.lang.String">
+    <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
             and nav.fund_name=#{fundName}
     </select>

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

@@ -40,9 +40,9 @@ public class EmailFundInfoServiceImpl implements EmailFundInfoService {
 
     @Override
     public void reparseValuationFile(String sourceFundName) {
-        List<String> fileIdList = emailFundNavMapper.selectFileIdByFundName(sourceFundName);
+        List<Integer> fileIdList = emailFundNavMapper.selectFileIdByFundName(sourceFundName);
         //过滤其他文件类型，只保留估值表
-        List<String> valuationFileId = emailFileInfoMapper.selectValuationFileId(fileIdList);
-
+        List<Integer> valuationFileId = emailFileInfoMapper.selectValuationFileId(fileIdList);
+        emailParseApiService.reparseFile(valuationFileId);
     }
 }