fix: 文件管理批量分类问题处理

service-base/src/main/resources/mapper/daq/DeletionInfoMapper.xml

@@ -344,7 +344,7 @@
     </update>
     <update id="batchUpdateRemark">
         <foreach collection="itemDoList" item="itemDo" index="index" open="" close="" separator=";">
-            update deletion_info set remark=#{itemDo.remark},updaterid=#{itemDo.updaterId} where isvalid=1 and remark is null and channel_id=#{channelId}
+            update deletion_info set remark=#{itemDo.remark},updaterid=#{itemDo.updaterId} where isvalid=1 and remark is null and channel_id=#{itemDo.channelId}
             <if test="itemDo.fundId != null and itemDo.fundId !=''">
                 and fund_id=#{itemDo.fundId}
             </if>

service-base/src/main/resources/mapper/daq/DistributionMapper.xml

@@ -156,7 +156,7 @@
         select id,fund_id,distribute_date,distribute_type,distribution,isvalid,creatorid,createtime,updatetime,updaterid
         from distribution where isvalid =1 and fund_id=#{fundId} and distribute_type=#{distributeType} and channel_id=#{channelId}
     </select>
-    <select id="getSumDistributeByFundId" resultType="java.math.BigDecimal" parameterType="java.lang.String">
+    <select id="getSumDistributeByFundId" resultType="java.math.BigDecimal">
         select sum(distribution) from distribution where isvalid =1 and fund_id=#{fundId} and distribute_date <![CDATA[ <= ]]> #{distributeDate} and channel_id=#{channelId}
     </select>
     <select id="countDistributionTotal" resultType="java.lang.Long">

service-base/src/main/resources/mapper/daq/FundPositionDetailMapper.xml

@@ -36,8 +36,7 @@
         where fund_id = #{fundId}
           and valuation_date = #{valuationDate} and channel_id=#{channelId}
     </delete>
-    <select id="fundPositionDetailByFundId" resultMap="BaseResultMap"
-            parameterType="java.lang.String">
+    <select id="fundPositionDetailByFundId" resultMap="BaseResultMap">
         select distinct fund_id,valuation_date from fund_position_detail where fund_id=#{fundId} and isvalid=1 and channel_id=#{channelId}
     </select>
 

service-manage/src/main/java/com/simuwang/manage/api/file/FileManageController.java

@@ -65,6 +65,9 @@ public class FileManageController {
                                        @RequestParam("registerNumber") String registerNumber,
                                        @RequestParam("fileType") Integer fileType,
                                        @RequestParam("fileDate") String fileDate) {
+        if(registerNumber == null || registerNumber.equals("null")){
+            registerNumber = null;
+        }
         ResultVo vo = fileMangeService.uploadFile(file,fundId,fundName,registerNumber, fileType,fileDate);
         return vo;
     }