Przeglądaj źródła

fix: 调整净值规模导入渠道设置问题

chenjianhua 1 miesiąc temu
rodzic
commit
3b85c0ad4b

+ 1 - 3
service-base/src/main/resources/mapper/daq/AssetMapper.xml

@@ -35,9 +35,7 @@
             where isvalid = 1
             and fund_id = #{itemDo.fundId}
             and price_date = #{itemDo.priceDate}
-            <if test="itemDo.channelId != null and itemDo.channelId !=''">
-                and channel_id = #{itemDo.channelId}
-            </if>
+            and channel_id = #{itemDo.channelId}
         </foreach>
     </insert>
     <delete id="deleteAsset">

+ 1 - 3
service-base/src/main/resources/mapper/daq/NavMapper.xml

@@ -38,9 +38,7 @@
             where isvalid = 1
             and fund_id = #{itemDo.fundId}
             and price_date = #{itemDo.priceDate}
-            <if test="itemDo.channelId != null and itemDo.channelId !='">
-                and channel_id = #{itemDo.channelId}
-            </if>
+            and channel_id = #{itemDo.channelId}
         </foreach>
     </insert>
     <insert id="saveNav" parameterType="com.simuwang.base.pojo.dos.NavDO">

+ 1 - 1
service-manage/src/main/java/com/simuwang/manage/service/impl/FundNavAssetServiceImpl.java

@@ -223,7 +223,7 @@ public class FundNavAssetServiceImpl implements FundNavAssetService {
                 }
                 FundAssetVO fundAssetVO = new FundAssetVO();
                 fundAssetVO.setFundId(excelData.getFundId());
-                fundNavVO.setChannelId(Integer.valueOf(excelData.getChannelId().trim()));
+                fundAssetVO.setChannelId(Integer.valueOf(excelData.getChannelId().trim()));
                 fundAssetVO.setPriceDate(excelData.getPriceDate());
                 fundAssetVO.setAssetNet(StringUtil.isEmpty(excelData.getAssetNet())?null:BigDecimal.valueOf(Double.valueOf(excelData.getAssetNet())));
                 fundAssetVO.setAssetShare(StringUtil.isEmpty(excelData.getAssetShare())?null:BigDecimal.valueOf(Double.valueOf(excelData.getAssetShare())));