Forráskód Böngészése

feat: 增加页面操作人ID

chenjianhua 7 hónapja
szülő
commit
65470d867b
19 módosított fájl, 67 hozzáadás és 31 törlés
  1. 1 1
      service-base/src/main/java/com/simuwang/base/mapper/AssetMapper.java
  2. 2 2
      service-base/src/main/java/com/simuwang/base/mapper/DeletionInfoMapper.java
  3. 1 1
      service-base/src/main/java/com/simuwang/base/mapper/DistributionMapper.java
  4. 1 1
      service-base/src/main/java/com/simuwang/base/mapper/FundAliasMapper.java
  5. 1 1
      service-base/src/main/java/com/simuwang/base/mapper/MailboxInfoMapper.java
  6. 1 1
      service-base/src/main/java/com/simuwang/base/mapper/NavMapper.java
  7. 1 1
      service-base/src/main/resources/mapper/AssetMapper.xml
  8. 3 2
      service-base/src/main/resources/mapper/DeletionInfoMapper.xml
  9. 2 2
      service-base/src/main/resources/mapper/DistributionMapper.xml
  10. 1 1
      service-base/src/main/resources/mapper/FundAliasMapper.xml
  11. 1 1
      service-base/src/main/resources/mapper/MailBoxInfoMapper.xml
  12. 1 1
      service-base/src/main/resources/mapper/NavMapper.xml
  13. 16 2
      service-manage/src/main/java/com/simuwang/manage/service/impl/DeletionServiceImpl.java
  14. 7 1
      service-manage/src/main/java/com/simuwang/manage/service/impl/DistributionServiceImpl.java
  15. 5 3
      service-manage/src/main/java/com/simuwang/manage/service/impl/EmailConfigServiceImpl.java
  16. 5 1
      service-manage/src/main/java/com/simuwang/manage/service/impl/FundAliasServiceImpl.java
  17. 8 2
      service-manage/src/main/java/com/simuwang/manage/service/impl/FundNavAssetServiceImpl.java
  18. 3 0
      service-manage/src/main/java/com/simuwang/manage/service/impl/FundReportFrequencyServiceImpl.java
  19. 7 7
      service-manage/src/main/java/com/simuwang/manage/task/FundDeletionTask.java

+ 1 - 1
service-base/src/main/java/com/simuwang/base/mapper/AssetMapper.java

@@ -18,7 +18,7 @@ public interface AssetMapper {
 
     AssetDO queryFundAsset(AssetDO fundAssetVO);
 
-    void deleteAsset(@Param("fundId") String fundId, @Param("priceDate") String priceDate);
+    void deleteAsset(@Param("fundId") String fundId, @Param("priceDate") String priceDate,@Param("updaterId")Integer userId);
 
     List<AssetDO> selectAssetByFundId(@Param("fundId")String fundId);
 }

+ 2 - 2
service-base/src/main/java/com/simuwang/base/mapper/DeletionInfoMapper.java

@@ -31,9 +31,9 @@ public interface DeletionInfoMapper {
 
     void update(FundDeletionInfoDO infoDO);
 
-    void batchUpdate(@Param("itemDoList") List<FundDeletionInfoVO> fundDeletionInfoVOList);
+    void batchUpdate(@Param("itemDoList") List<FundDeletionInfoDO> fundDeletionInfoDOList);
 
-    void updateRemark(@Param("fundId") String fundId, @Param("deletionType") Integer deletionType,@Param("deletionDate") String deletionDate, @Param("remark")String remark);
+    void updateRemark(@Param("fundId") String fundId, @Param("deletionType") Integer deletionType,@Param("deletionDate") String deletionDate, @Param("remark")String remark,@Param("userId")Integer userId);
 
     List<FundDeletionInfoDO> selectFundDeletionInfoVOList(@Param("fundId") String fundId,@Param("deletionType") Integer deletionType);
 

+ 1 - 1
service-base/src/main/java/com/simuwang/base/mapper/DistributionMapper.java

@@ -32,7 +32,7 @@ public interface DistributionMapper {
 
     void saveDistribution(DistributionDO distributionDO);
 
-    void deleteDistribution(@Param("ids") List<Integer> idList);
+    void deleteDistribution(@Param("ids") List<Integer> idList,@Param("updaterId")Integer userId);
 
     List<DistributionDO> getDistributionByFundId(@Param("fundId")String fundId,@Param("distributeType") DistributeType distributeType);
 

+ 1 - 1
service-base/src/main/java/com/simuwang/base/mapper/FundAliasMapper.java

@@ -26,5 +26,5 @@ public interface FundAliasMapper {
 
     void insert(@Param("fundName") String fundName, @Param("registerNumber") String registerNumber);
 
-    void batchDelete(@Param("idList") List<Integer> idList);
+    void batchDelete(@Param("idList") List<Integer> idList,@Param("updaterId")Integer userId);
 }

+ 1 - 1
service-base/src/main/java/com/simuwang/base/mapper/MailboxInfoMapper.java

@@ -21,7 +21,7 @@ public interface MailboxInfoMapper extends BaseMapper<MailboxInfoDO> {
 
     List<MailboxInfoDO> searchEmailConfigList(EmailPageQuery emailPageQuery);
 
-    void deleteEmailConfigByIds(@Param("ids") List<Integer> split);
+    void deleteEmailConfigByIds(@Param("ids") List<Integer> split,@Param("updaterId") Integer userId);
 
     MailboxInfoDO selectEmailConfigByEmail(@Param("email") String email);
 

+ 1 - 1
service-base/src/main/java/com/simuwang/base/mapper/NavMapper.java

@@ -21,7 +21,7 @@ public interface NavMapper {
 
     void updateNav(NavDO navDO);
 
-    void deleteNav(@Param("fundId")String fundId, @Param("priceDate")String priceDate);
+    void deleteNav(@Param("fundId")String fundId, @Param("priceDate")String priceDate,@Param("updaterId")Integer userId);
 
     List<String> getAllFundId();
 

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

@@ -38,7 +38,7 @@
         </foreach>
     </insert>
     <delete id="deleteAsset">
-        update PPW_EMAIL.asset set isvalid =0,updatetime=sysdate() where fund_id=#{fundId} and price_date=#{priceDate} and isvalid=1
+        update PPW_EMAIL.asset set isvalid =0,updatetime=sysdate(),updaterid=#{updaterId} where fund_id=#{fundId} and price_date=#{priceDate} and isvalid=1
     </delete>
 
     <select id="queryFundNavByDate" resultType="java.lang.String">

+ 3 - 2
service-base/src/main/resources/mapper/DeletionInfoMapper.xml

@@ -33,13 +33,14 @@
                 deletion_type = #{itemDo.deletionType},
                 deletion_date=#{itemDo.deletionDate},
                 remark=#{itemDo.remark},
-                updatetime=sysdate()
+                updatetime=sysdate(),
+                updaterid=#{updaterId}
             </set>
             where isvalid = 1 and id=#{itemDo.id}
         </foreach>
     </update>
     <update id="updateRemark">
-        update PPW_EMAIL.deletion_info set remark=#{remark} where isvalid=1
+        update PPW_EMAIL.deletion_info set remark=#{remark},updaterid=#{updaterId} where isvalid=1
         <if test="fundId != null and fundId !=''">
             and fund_id=#{fundId}
         </if>

+ 2 - 2
service-base/src/main/resources/mapper/DistributionMapper.xml

@@ -36,11 +36,11 @@
         values (#{fundId},#{distributeDate},#{distributeType},#{distribution},#{isvalid},#{creatorId},#{createTime},#{updateTime},#{updaterId})
     </insert>
     <update id="updateDistributionById" parameterType="com.simuwang.base.pojo.dos.DistributionDO">
-        update PPW_EMAIL.distribution set distribute_date=#{distributeDate},distribute_type=#{distributeType},distribution=#{distribution},updatetime=#{updateTime}
+        update PPW_EMAIL.distribution set distribute_date=#{distributeDate},distribute_type=#{distributeType},distribution=#{distribution},updatetime=#{updateTime},updaterid=#{updaterId}
         where id=#{id} and isvalid =1
     </update>
     <delete id="deleteDistribution" parameterType="com.simuwang.base.pojo.vo.IdListVO">
-        update PPW_EMAIL.distribution set isvalid =0,updatetime=sysdate() where isvalid =1 and id in
+        update PPW_EMAIL.distribution set isvalid =0,updatetime=sysdate(),updaterid=#{updaterId} where isvalid =1 and id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">
             #{id}
         </foreach>

+ 1 - 1
service-base/src/main/resources/mapper/FundAliasMapper.xml

@@ -19,7 +19,7 @@
         where isvalid =1 and id=#{id}
     </update>
     <update id="batchDelete">
-        update PPW_EMAIL.fund_alias set isvalid=0,updatetime=sysdate() where isvalid =1 and id in
+        update PPW_EMAIL.fund_alias set isvalid=0,updatetime=sysdate(),updaterid=#{updaterId} where isvalid =1 and id in
         <foreach collection="idList" index="index" item="id" separator="," open="(" close=")">
             #{id}
         </foreach>

+ 1 - 1
service-base/src/main/resources/mapper/MailBoxInfoMapper.xml

@@ -19,7 +19,7 @@
         <result column="isvalid" property="isvalid"/>
     </resultMap>
     <update id="deleteEmailConfigByIds">
-        update PPW_EMAIL.mailbox_info set isvalid =0,updatetime=sysdate() where id in
+        update PPW_EMAIL.mailbox_info set isvalid =0,updatetime=sysdate(),updaterid=#{updaterId} where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">
             #{id}
         </foreach>

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

@@ -57,7 +57,7 @@
         and id=#{id}
     </update>
     <delete id="deleteNav">
-        update PPW_EMAIL.nav set isvalid =0,updatetime=sysdate() where fund_id=#{fundId} and price_date=#{priceDate} and isvalid =1
+        update PPW_EMAIL.nav set isvalid =0,updatetime=sysdate(),updaterid=#{updaterId} where fund_id=#{fundId} and price_date=#{priceDate} and isvalid =1
     </delete>
 
     <select id="queryFundNavByDate" resultType="java.lang.String">

+ 16 - 2
service-manage/src/main/java/com/simuwang/manage/service/impl/DeletionServiceImpl.java

@@ -14,6 +14,7 @@ import com.simuwang.base.pojo.dto.query.DeletionPageQuery;
 import com.simuwang.base.pojo.dto.query.FundDeletionPageQuery;
 import com.simuwang.base.pojo.vo.*;
 import com.simuwang.manage.service.DeletionService;
+import com.simuwang.shiro.utils.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -61,14 +62,27 @@ public class DeletionServiceImpl implements DeletionService {
 
     @Override
     public void saveFundDeletionList(List<FundDeletionInfoVO> fundDeletionInfoVOList) {
-        deletionInfoMapper.batchUpdate(fundDeletionInfoVOList);
+        List<FundDeletionInfoDO> fundDeletionInfoDOList = new ArrayList<>();
+        for(FundDeletionInfoVO vo : fundDeletionInfoVOList){
+            FundDeletionInfoDO fundDeletionInfoDO = new FundDeletionInfoDO();
+            fundDeletionInfoDO.setId(vo.getId());
+            fundDeletionInfoDO.setDeletionType(vo.getDeletionType());
+            fundDeletionInfoDO.setFundId(vo.getFundId());
+            fundDeletionInfoDO.setDeletionDate(vo.getDeletionDate());
+            fundDeletionInfoDO.setIsvalid(1);
+            fundDeletionInfoDO.setUpdateTime(DateUtils.getNowDate());
+            fundDeletionInfoDO.setUpdaterId(UserUtils.getLoginUser().getUserId());
+            fundDeletionInfoDOList.add(fundDeletionInfoDO);
+        }
+        deletionInfoMapper.batchUpdate(fundDeletionInfoDOList);
     }
 
     @Override
     public void saveBatchDeletionRemark(FundDeletionRemarkVO fundDeletionRemarkVO) {
         String remark = fundDeletionRemarkVO.getRemark();
+        Integer userId = UserUtils.getLoginUser().getUserId();
         for(FundDeletionTypeVO remarkVO : fundDeletionRemarkVO.getFundDeletionTypeList()){
-            deletionInfoMapper.updateRemark(remarkVO.getFundId(),remarkVO.getDeletionType(),remarkVO.getDeletionDate(),remark);
+            deletionInfoMapper.updateRemark(remarkVO.getFundId(),remarkVO.getDeletionType(),remarkVO.getDeletionDate(),remark,userId);
         }
     }
 

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

@@ -23,6 +23,7 @@ import com.simuwang.base.pojo.dto.DistributionExcelData;
 import com.simuwang.base.pojo.dto.query.DistributionPageQuery;
 import com.simuwang.base.pojo.vo.*;
 import com.simuwang.manage.service.DistributionService;
+import com.simuwang.shiro.utils.UserUtils;
 import com.smppw.common.pojo.ResultVo;
 import com.smppw.common.pojo.enums.status.ResultCode;
 import com.smppw.common.pojo.enums.status.StatusCode;
@@ -79,6 +80,8 @@ public class DistributionServiceImpl implements DistributionService {
         NavDO navDO = new NavDO();
         navDO.setFundId(distributionVO.getFundId());
         navDO.setNav(distributionVO.getNav());
+        navDO.setCreatorId(UserUtils.getLoginUser().getUserId());
+        navDO.setUpdaterId(UserUtils.getLoginUser().getUserId());
         navDO.setCumulativeNavWithdrawal(distributionVO.getCumulativeNavWithdrawal());
         navDO.setPriceDate(DateUtils.parse(distributionVO.getDistributeDate(),DateUtils.YYYY_MM_DD));
         if(StringUtil.isNull(distributionVO.getNav()) || StringUtil.isNull(distributionVO.getCumulativeNavWithdrawal())){
@@ -95,6 +98,8 @@ public class DistributionServiceImpl implements DistributionService {
         distributionDO.setDistributeDate(DateUtils.parse(distributionVO.getDistributeDate(),DateUtils.YYYY_MM_DD));
         distributionDO.setDistributeType(distributionVO.getDistributeType());
         distributionDO.setIsvalid(1);
+        distributionDO.setCreatorId(UserUtils.getLoginUser().getUserId());
+        distributionDO.setUpdaterId(UserUtils.getLoginUser().getUserId());
         distributionDO.setUpdateTime(DateUtils.getNowDate());
         DistributionDO oldDistributionDO = distributionMapper.selectDistributionByDate(distributionVO.getFundId(),DateUtils.parse(distributionVO.getDistributeDate(),DateUtils.YYYY_MM_DD));
         if(!StringUtil.isNull(oldDistributionDO)){
@@ -129,7 +134,8 @@ public class DistributionServiceImpl implements DistributionService {
 
     @Override
     public void deleteDistribution(IdListVO idListVO) {
-        distributionMapper.deleteDistribution(idListVO.getIdList());
+        Integer userId = UserUtils.getLoginUser().getUserId();
+        distributionMapper.deleteDistribution(idListVO.getIdList(),userId);
     }
 
     @Override

+ 5 - 3
service-manage/src/main/java/com/simuwang/manage/service/impl/EmailConfigServiceImpl.java

@@ -21,6 +21,7 @@ import com.simuwang.base.pojo.vo.OpenStatusVO;
 import com.simuwang.base.pojo.vo.ParseParamVO;
 import com.simuwang.daq.service.EmailParseApiService;
 import com.simuwang.manage.service.EmailConfigService;
+import com.simuwang.shiro.utils.UserUtils;
 import com.smppw.common.pojo.ResultVo;
 import com.smppw.utils.DateUtil;
 import jakarta.mail.MessagingException;
@@ -151,7 +152,8 @@ public class EmailConfigServiceImpl implements EmailConfigService {
         QuartzUtils.deleteScheduleJob(scheduler,mailboxInfoDO.getEmail(),groupName);
         List<Integer> idList = new ArrayList<>();
         idList.add(id);
-        emailConfigMapper.deleteEmailConfigByIds(idList);
+        Integer userId = UserUtils.getLoginUser().getUserId();
+        emailConfigMapper.deleteEmailConfigByIds(idList,userId);
     }
     @Override
     public boolean checkEmailUnique(String email) {
@@ -253,8 +255,8 @@ public class EmailConfigServiceImpl implements EmailConfigService {
         mailboxInfoDO.setProtocol(mailboxInfoVO.getProtocol());
         mailboxInfoDO.setOpenStatus(mailboxInfoVO.getOpenStatus());
         mailboxInfoDO.setUpdateTime(new Date());
-        mailboxInfoDO.setUpdaterId(999);
-        mailboxInfoDO.setCreatorId(999);
+        mailboxInfoDO.setUpdaterId(UserUtils.getLoginUser().getUserId());
+        mailboxInfoDO.setCreatorId(UserUtils.getLoginUser().getUserId());
         return mailboxInfoDO;
     }
 

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

@@ -14,6 +14,7 @@ import com.simuwang.manage.service.EmailFundAssetService;
 import com.simuwang.manage.service.EmailFundNavService;
 import com.simuwang.manage.service.EmailFundInfoService;
 import com.simuwang.manage.service.FundAliasService;
+import com.simuwang.shiro.utils.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -91,6 +92,8 @@ public class FundAliasServiceImpl implements FundAliasService {
         fundAliasDO.setTargetRegisterNumber(fundAliasVO.getTargetRegisterNumber());
         fundAliasDO.setId(fundAliasVO.getId());
         fundAliasDO.setIsvalid(1);
+        fundAliasDO.setUpdaterId(UserUtils.getLoginUser().getUserId());
+        fundAliasDO.setCreatorId(UserUtils.getLoginUser().getUserId());
         fundAliasDO.setUpdateTime(new Date());
         fundAliasMapper.saveFundAlias(fundAliasDO);
         //将采集的净值数据匹配之后重新入库
@@ -104,8 +107,9 @@ public class FundAliasServiceImpl implements FundAliasService {
     @Override
     public void deleteFundAlias(IdListVO idListVO) {
         List<Integer> idList = idListVO.getIdList();
+        Integer userId = UserUtils.getLoginUser().getUserId();
         if(idList.size() > 0){
-            fundAliasMapper.batchDelete(idList);
+            fundAliasMapper.batchDelete(idList,userId);
         }
     }
 }

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

@@ -20,6 +20,7 @@ import com.simuwang.base.pojo.dto.NavAssetExcelData;
 import com.simuwang.base.pojo.dto.query.FundNavAssetPageQuery;
 import com.simuwang.base.pojo.vo.*;
 import com.simuwang.manage.service.FundNavAssetService;
+import com.simuwang.shiro.utils.UserUtils;
 import com.smppw.common.pojo.ResultVo;
 import com.smppw.common.pojo.enums.status.ResultCode;
 import org.apache.commons.io.FileUtils;
@@ -80,6 +81,8 @@ public class FundNavAssetServiceImpl implements FundNavAssetService {
         assetDO.setPriceDate(DateUtils.parse(fundAssetVO.getPriceDate(),DateUtils.YYYY_MM_DD));
         assetDO.setFundId(fundAssetVO.getFundId());
         assetDO.setUpdateTime(DateUtils.getNowDate());
+        assetDO.setCreatorId(UserUtils.getLoginUser().getUserId());
+        assetDO.setUpdaterId(UserUtils.getLoginUser().getUserId());
         assetDO.setIsvalid(1);
         AssetDO oldAssetDO = assetMapper.queryFundAsset(assetDO);
         if(StringUtil.isNull(oldAssetDO)){
@@ -104,6 +107,8 @@ public class FundNavAssetServiceImpl implements FundNavAssetService {
         navDO.setNav(fundNavVO.getNav());
         navDO.setPriceDate(DateUtils.parse(fundNavVO.getPriceDate(),DateUtils.YYYY_MM_DD));
         navDO.setIsvalid(1);
+        navDO.setCreatorId(UserUtils.getLoginUser().getUserId());
+        navDO.setUpdaterId(UserUtils.getLoginUser().getUserId());
         navDO.setUpdateTime(DateUtils.getNowDate());
         NavDO oldNav = navMapper.queryFundNav(navDO);
         if(StringUtil.isNull(oldNav)){
@@ -123,9 +128,10 @@ public class FundNavAssetServiceImpl implements FundNavAssetService {
     @Override
     public void deleteFundNavAsset(FundNavAssetDelListVO fundNavAssetDelListVO) {
         List<FundNavAssetDelVO> delVOList = fundNavAssetDelListVO.getFundNavAssetDelVOList();
+        Integer userId = UserUtils.getLoginUser().getUserId();
         for(FundNavAssetDelVO delVO : delVOList){
-            navMapper.deleteNav(delVO.getFundId(),delVO.getPriceDate());
-            assetMapper.deleteAsset(delVO.getFundId(),delVO.getPriceDate());
+            navMapper.deleteNav(delVO.getFundId(),delVO.getPriceDate(),userId);
+            assetMapper.deleteAsset(delVO.getFundId(),delVO.getPriceDate(),userId);
         }
     }
 

+ 3 - 0
service-manage/src/main/java/com/simuwang/manage/service/impl/FundReportFrequencyServiceImpl.java

@@ -4,6 +4,7 @@ import com.simuwang.base.mapper.FundReportFrequencyMapper;
 import com.simuwang.base.pojo.dos.FundReportFrequencyDO;
 import com.simuwang.base.pojo.vo.FundReportFrequencyVO;
 import com.simuwang.manage.service.FundReportFrequencyService;
+import com.simuwang.shiro.utils.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -31,6 +32,8 @@ public class FundReportFrequencyServiceImpl implements FundReportFrequencyServic
             fundReportFrequencyDO.setNavFrequency(fundReportFrequency.getNavFrequency());
             fundReportFrequencyDO.setUpdateTime(new Date());
             fundReportFrequencyDO.setFrequencyRemark(fundReportFrequency.getFrequencyRemark());
+            fundReportFrequencyDO.setCreatorId(UserUtils.getLoginUser().getUserId());
+            fundReportFrequencyDO.setUpdaterId(UserUtils.getLoginUser().getUserId());
             FundReportFrequencyDO oldFrequency = fundReportFrequencyMapper.getFrequencyByFundId(fundId);
             if(oldFrequency == null){
                 fundReportFrequencyDO.setCreateTime(new Date());

+ 7 - 7
service-manage/src/main/java/com/simuwang/manage/task/FundDeletionTask.java

@@ -85,7 +85,7 @@ public class FundDeletionTask {
         List<DistributionDO> distributionDOS = distributionMapper.getDistributionByFundId(fundId, DistributeType.DIVIDENDS_SPLIT);
         if(distributionDOS.size() > 0){
             //存在拆分,不做分红缺失计算,同时把以往的数据添加备注
-            deletionInfoMapper.updateRemark(fundId,DeletionType.ASSET_DELETION.getCode(),null,DeletionType.EXIST_SPLIT.getInfo());
+            deletionInfoMapper.updateRemark(fundId,DeletionType.ASSET_DELETION.getCode(),null,DeletionType.EXIST_SPLIT.getInfo(),null);
             return;
         }
         BigDecimal threshold = new BigDecimal(0.0035);
@@ -126,7 +126,7 @@ public class FundDeletionTask {
             Map<String,List<TradeDateDO>> tradeListMap = tradeDateDOList.stream().collect(Collectors.groupingBy(e -> DateUtils.format(e.getTradeDate(),DateUtils.YYYY_MM_DD)));
             for(String tradeDate : tradeListMap.keySet()){
                 if(navListMap.containsKey(tradeDate)){
-                    deletionInfoMapper.updateRemark(fundId,DeletionType.ASSET_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo());
+                    deletionInfoMapper.updateRemark(fundId,DeletionType.ASSET_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo(),null);
                     continue;
                 }
                 //写入缺失信息表
@@ -154,7 +154,7 @@ public class FundDeletionTask {
                 if(weekNavListMap.containsKey(weekOfYear)){
                     List<AssetDO> assetDOS = weekNavListMap.get(weekOfYear);
                     String tradeDate = DateUtils.format(assetDOS.get(assetDOS.size()-1).getPriceDate(),DateUtils.YYYY_MM_DD);
-                    deletionInfoMapper.updateRemark(fundId,DeletionType.ASSET_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo());
+                    deletionInfoMapper.updateRemark(fundId,DeletionType.ASSET_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo(),null);
                     continue;
                 }
                 //不包含的话,默认取每周的最后一个交易日作为周净值日期
@@ -188,7 +188,7 @@ public class FundDeletionTask {
                 if(monthNavListMap.containsKey(yearMonth)){
                     List<AssetDO> assetDOS = monthNavListMap.get(yearMonth);
                     String tradeDate = DateUtils.format(assetDOS.get(assetDOS.size()-1).getPriceDate(),DateUtils.YYYY_MM_DD);
-                    deletionInfoMapper.updateRemark(fundId,DeletionType.ASSET_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo());
+                    deletionInfoMapper.updateRemark(fundId,DeletionType.ASSET_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo(),null);
                     continue;
                 }
                 //不包含的话,默认取每周的最后一个交易日作为周净值日期
@@ -210,7 +210,7 @@ public class FundDeletionTask {
             Map<String,List<TradeDateDO>> tradeListMap = tradeDateDOList.stream().collect(Collectors.groupingBy(e -> DateUtils.format(e.getTradeDate(),DateUtils.YYYY_MM_DD)));
             for(String tradeDate : tradeListMap.keySet()){
                 if(navListMap.containsKey(tradeDate)){
-                    deletionInfoMapper.updateRemark(fundId,DeletionType.NAV_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo());
+                    deletionInfoMapper.updateRemark(fundId,DeletionType.NAV_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo(),null);
                     continue;
                 }
                 //写入缺失信息表
@@ -238,7 +238,7 @@ public class FundDeletionTask {
                 if(weekNavListMap.containsKey(weekOfYear)){
                     List<NavDO> navDOS = weekNavListMap.get(weekOfYear);
                     String tradeDate = DateUtils.format(navDOS.get(navDOS.size()-1).getPriceDate(),DateUtils.YYYY_MM_DD);
-                    deletionInfoMapper.updateRemark(fundId,DeletionType.NAV_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo());
+                    deletionInfoMapper.updateRemark(fundId,DeletionType.NAV_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo(),null);
                     continue;
                 }
                 //不包含的话,默认取每周的最后一个交易日作为周净值日期
@@ -272,7 +272,7 @@ public class FundDeletionTask {
                 if(monthNavListMap.containsKey(yearMonth)){
                     List<NavDO> navDOS = monthNavListMap.get(yearMonth);
                     String tradeDate = DateUtils.format(navDOS.get(navDOS.size()-1).getPriceDate(),DateUtils.YYYY_MM_DD);
-                    deletionInfoMapper.updateRemark(fundId,DeletionType.NAV_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo());
+                    deletionInfoMapper.updateRemark(fundId,DeletionType.NAV_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo(),null);
                     continue;
                 }
                 //不包含的话,默认取每周的最后一个交易日作为周净值日期