合并

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);
 }

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);
 

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);
 

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);
 }

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);
 

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();
 

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">

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>

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>

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>

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>

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">

service-manage/src/main/java/com/simuwang/manage/api/company/CompanyEmailSendHistoryController.java

@@ -5,6 +5,7 @@ import com.simuwang.base.common.support.MybatisPage;
 import com.simuwang.base.pojo.dto.query.CompanyEmailHistoryPageQuery;
 import com.simuwang.base.pojo.dto.query.CompanyEmailPageQuery;
 import com.simuwang.base.pojo.vo.*;
+import com.simuwang.logging.SystemLog;
 import com.simuwang.manage.service.CompanyEmailConfigService;
 import com.simuwang.manage.service.CompanyEmailSendHistoryService;
 import com.smppw.common.pojo.ResultVo;
@@ -34,6 +35,7 @@ public class CompanyEmailSendHistoryController{
      * @param companyEmailPageQuery
      * @return
      */
+    @SystemLog(value = "公司邮箱查询")
     @RequestMapping("search-company-email")
     public MybatisPage<CompanyEmailSendHistoryVO> searchCompanyEmail(CompanyEmailPageQuery companyEmailPageQuery){
         MybatisPage<CompanyEmailSendHistoryVO> result = companyEmailSendHistoryService.searchCompanyEmail(companyEmailPageQuery);
@@ -45,6 +47,7 @@ public class CompanyEmailSendHistoryController{
      * @param  companyEmailHistoryPageQuery
      * @return
      */
+    @SystemLog(value = "公司邮箱发送历史查询")
     @RequestMapping("search-email-history")
     public MybatisPage<CompanyEmailSendHistoryVO> searchEmailHistory(CompanyEmailHistoryPageQuery companyEmailHistoryPageQuery){
         MybatisPage<CompanyEmailSendHistoryVO> result = companyEmailSendHistoryService.searchEmailHistory(companyEmailHistoryPageQuery);
@@ -57,6 +60,7 @@ public class CompanyEmailSendHistoryController{
      * @param idVO
      * @return
      */
+    @SystemLog(value = "公司邮箱配置查询")
     @RequestMapping("search-email-config")
     public ResultVo<CompanyEmailConfigVO> searchEmailConfig(IdVO idVO){
         CompanyEmailConfigVO configVO = companyEmailSendHistoryService.searchEmailConfig(idVO);
@@ -68,6 +72,7 @@ public class CompanyEmailSendHistoryController{
      * @param idListVO
      * @return
      */
+    @SystemLog(value = "删除公司邮箱配置")
     @PostMapping("delete-company-email")
     public boolean deleteEmail(@RequestBody IdListVO idListVO){
         companyEmailSendHistoryService.deleteEmail(idListVO.getIdList());
@@ -79,6 +84,7 @@ public class CompanyEmailSendHistoryController{
      * @param comyanyEmailIdVO 已选行的idList
      * @return
      */
+    @SystemLog(value = "删除公司邮箱发送历史")
     @PostMapping("delete-email-history")
     public boolean deleteEmailHistory(@RequestBody IdListVO comyanyEmailIdVO){
         companyEmailSendHistoryService.deleteEmailHistory(comyanyEmailIdVO.getIdList());
@@ -90,6 +96,7 @@ public class CompanyEmailSendHistoryController{
      * @param companyEmailConfigVOList
      * @return
      */
+    @SystemLog(value = "保存公司邮箱")
     @PostMapping("save-email-config")
     public ResultVo saveCompanyEmailConfig(@RequestBody List<CompanyEmailConfigVO> companyEmailConfigVOList){
         ResultVo vo = companyEmailConfigService.saveCompanyEmailConfig(companyEmailConfigVOList);
@@ -101,6 +108,7 @@ public class CompanyEmailSendHistoryController{
      * @param companyEmailConfigVO
      * @return
      */
+    @SystemLog(value = "修改公司邮箱")
     @PostMapping("update-email-config")
     public boolean updateCompanyEmailConfig(@RequestBody CompanyEmailConfigVO companyEmailConfigVO){
         companyEmailConfigService.updateCompanyEmailConfig(companyEmailConfigVO);
@@ -112,6 +120,7 @@ public class CompanyEmailSendHistoryController{
      * @param comyanyEmailIdVO --id
      * @return
      */
+    @SystemLog(value = "删除公司邮箱")
     @PostMapping("delete-email-config")
     public boolean deleteCompanyEmailConfig(@RequestBody IdVO comyanyEmailIdVO){
         companyEmailConfigService.deleteCompanyEmailConfig(comyanyEmailIdVO.getId());
@@ -124,6 +133,7 @@ public class CompanyEmailSendHistoryController{
      * @param idListVO  已选行的companyIdList
      * @return
      */
+    @SystemLog(value = "发送缺失数据")
     @PostMapping("send-company-email")
     public boolean sendCompanyEmail(@RequestBody IdListVO idListVO){
         companyEmailConfigService.sendCompanyEmail(idListVO.getIdList());

service-manage/src/main/java/com/simuwang/manage/api/deletion/DeletionController.java

@@ -8,6 +8,7 @@ import com.simuwang.base.pojo.dto.ExcelDeletionInfoDTO;
 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.logging.SystemLog;
 import com.simuwang.manage.service.DeletionService;
 import com.smppw.common.pojo.ResultVo;
 import jakarta.servlet.ServletOutputStream;
@@ -46,6 +47,7 @@ public class DeletionController {
      * @param deletionPageQuery
      * @return
      */
+    @SystemLog(value = "缺失管理查询")
     @RequestMapping("search-deletion-list")
     public MybatisPage<DeletionInfoVO> searchDeletionList(DeletionPageQuery deletionPageQuery){
         MybatisPage<DeletionInfoVO> result = deletionService.searchDeletionList(deletionPageQuery);
@@ -57,6 +59,7 @@ public class DeletionController {
      * @param fundDeletionPageQuery
      * @return
      */
+    @SystemLog(value = "查询基金缺失明细")
     @RequestMapping("search-fund-deletion")
     public MybatisPage<FundDeletionInfoVO> searchFundDeletionList(FundDeletionPageQuery fundDeletionPageQuery){
         MybatisPage<FundDeletionInfoVO> result = deletionService.searchFundDeletionList(fundDeletionPageQuery);
@@ -68,6 +71,7 @@ public class DeletionController {
      * @param fundDeletionInfoVOList
      * @return
      */
+    @SystemLog(value = "保存缺失备注")
     @RequestMapping("save-fund-deletion")
     public ResultVo saveFundDeletionList(@RequestBody List<FundDeletionInfoVO> fundDeletionInfoVOList){
         deletionService.saveFundDeletionList(fundDeletionInfoVOList);
@@ -79,6 +83,7 @@ public class DeletionController {
      * @param fundDeletionRemarkVO
      * @return
      */
+    @SystemLog(value = "批量修改缺失备注")
     @RequestMapping("batch-deletion-remark")
     public ResultVo saveBatchDeletionRemark(@RequestBody FundDeletionRemarkVO fundDeletionRemarkVO){
         deletionService.saveBatchDeletionRemark(fundDeletionRemarkVO);
@@ -91,6 +96,7 @@ public class DeletionController {
      * @return
      */
     @ExcludeGlobalResult
+    @SystemLog(value = "下载缺失数据")
     @PostMapping("/download-fund-deletion")
     public void downloadFundDeletion(@RequestBody FundDeletionListVO fundDeletionListVO, HttpServletResponse response){
         List<ExcelDeletionInfoDTO> fundDeletionInfoVOList = deletionService.selectFundDeletionInfoVOList(fundDeletionListVO);
@@ -126,12 +132,6 @@ public class DeletionController {
             outputStream.close();
         } catch (Exception e) {
             logger.error(e.getMessage(),e);
-        } finally {
-            try {
-                wb.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
         }
     }
 }

service-manage/src/main/java/com/simuwang/manage/api/distribution/DistributionController.java

@@ -5,6 +5,7 @@ import com.simuwang.base.pojo.dto.query.DistributionPageQuery;
 import com.simuwang.base.pojo.vo.DistributionTablePageVO;
 import com.simuwang.base.pojo.vo.DistributionVO;
 import com.simuwang.base.pojo.vo.IdListVO;
+import com.simuwang.logging.SystemLog;
 import com.simuwang.manage.service.DistributionService;
 import com.smppw.common.pojo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +31,7 @@ public class DistributionController {
      * @param distributionPageQuery
      * @return
      */
+    @SystemLog(value = "分红页面展示查询")
     @RequestMapping("search-distribution-list")
     public MybatisPage<DistributionTablePageVO> searchDistributionList(DistributionPageQuery distributionPageQuery) {
         MybatisPage<DistributionTablePageVO> result = distributionService.searchDistributionList(distributionPageQuery);
@@ -42,6 +44,7 @@ public class DistributionController {
      * @param distributionVO
      * @return
      */
+    @SystemLog(value = "保存分红信息")
     @RequestMapping("save-distribution")
     public ResultVo saveDistribution(@RequestBody DistributionVO distributionVO) {
         ResultVo vo = distributionService.saveDistribution(distributionVO);
@@ -54,6 +57,7 @@ public class DistributionController {
      * @param idListVO
      * @return
      */
+    @SystemLog(value = "删除分红")
     @PostMapping("delete-distribution")
     public boolean deleteDistribution(@RequestBody IdListVO idListVO){
         distributionService.deleteDistribution(idListVO);
@@ -66,6 +70,7 @@ public class DistributionController {
      * @param file
      * @return
      */
+    @SystemLog(value = "上传分红")
     @PostMapping("upload-distribution")
     public ResultVo uploadDistribution(@RequestPart(value = "file") MultipartFile file) {
         ResultVo vo = distributionService.uploadDistribution(file);

service-manage/src/main/java/com/simuwang/manage/api/email/EmailAssetDetailController.java

@@ -3,6 +3,7 @@ package com.simuwang.manage.api.email;
 import com.simuwang.base.common.support.MybatisPage;
 import com.simuwang.base.pojo.dto.query.ParseDetailPageQuery;
 import com.simuwang.base.pojo.vo.EmailFundAssetVO;
+import com.simuwang.logging.SystemLog;
 import com.simuwang.manage.service.ParseEmailDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -27,6 +28,7 @@ public class EmailAssetDetailController{
      * @param parseDetailPageQuery
      * @return
      */
+    @SystemLog(value = "规模解析数据详情页面展示")
     @GetMapping("/search-asset-detail")
     public MybatisPage<EmailFundAssetVO> searchAssetDetail(ParseDetailPageQuery parseDetailPageQuery){
         MybatisPage<EmailFundAssetVO> result = parseEmailDetailService.searchAssetDetail(parseDetailPageQuery);

service-manage/src/main/java/com/simuwang/manage/api/email/EmailConfigController.java

@@ -4,6 +4,7 @@ import com.simuwang.base.common.support.MybatisPage;
 import com.simuwang.base.config.DaqProperties;
 import com.simuwang.base.pojo.dto.query.EmailPageQuery;
 import com.simuwang.base.pojo.vo.*;
+import com.simuwang.logging.SystemLog;
 import com.simuwang.manage.service.EmailConfigService;
 import com.smppw.common.pojo.ResultVo;
 import com.smppw.common.pojo.enums.status.ResultCode;
@@ -30,6 +31,7 @@ public class EmailConfigController{
      * @param emailPageQuery 邮箱
      * @return
      */
+    @SystemLog(value = "邮箱配置页面展示查询")
     @RequestMapping("search-email-list")
     public MybatisPage<MailboxInfoTableVO> searchEmailConfigList(EmailPageQuery emailPageQuery){
         MybatisPage<MailboxInfoTableVO> result = emailConfigService.searchEmailConfigList(emailPageQuery);
@@ -40,6 +42,7 @@ public class EmailConfigController{
      * @param mailboxInfoVO
      * @return
      */
+    @SystemLog(value = "保存邮箱配置")
     @PostMapping("save-email-config")
     public ResultVo saveEmailConfig(@RequestBody MailboxInfoVO mailboxInfoVO){
         ResultVo vo = new ResultVo(ResultCode.SAVE_SUCCESS.getCode());
@@ -63,6 +66,7 @@ public class EmailConfigController{
      * @param openStatusVO
      * @return
      */
+    @SystemLog(value = "开启关闭邮箱启动状态")
     @PostMapping("control-email-status")
     public ResultVo controlEmailConfig(@RequestBody OpenStatusVO openStatusVO){
         ResultVo vo = new ResultVo(ResultCode.SAVE_SUCCESS.getCode());
@@ -81,6 +85,7 @@ public class EmailConfigController{
      * @param idVO
      * @return
      */
+    @SystemLog(value = "根据ID查询邮箱配置")
     @GetMapping("search-email-config")
     public ResultVo searchEmailConfig(IdVO idVO){
         ResultVo vo = new ResultVo(ResultCode.SAVE_SUCCESS.getCode());
@@ -99,6 +104,7 @@ public class EmailConfigController{
      * @param idVO
      * @return
      */
+    @SystemLog(value = "批量删除邮箱配置")
     @RequestMapping("delete-email-config")
     public boolean deleteEmailConfig(@RequestBody IdVO idVO){
         emailConfigService.deleteEmailConfig(idVO.getId());
@@ -110,6 +116,7 @@ public class EmailConfigController{
      * @param parseParamVO
      * @return
      */
+    @SystemLog(value = "手动触发指定时间区间的邮件解析")
     @RequestMapping("parse-email")
     public boolean parseEmail(@RequestBody ParseParamVO parseParamVO){
         emailConfigService.parseEmail(parseParamVO);
@@ -121,6 +128,7 @@ public class EmailConfigController{
      * @param idVO
      * @return
      */
+    @SystemLog(value = "立即执行一次邮件解析")
     @RequestMapping("run-once")
     public boolean runOnce(@RequestBody IdVO idVO){
         emailConfigService.runOnce(idVO.getId());
@@ -132,6 +140,7 @@ public class EmailConfigController{
      * @param mailboxInfoVO
      * @return
      */
+    @SystemLog(value = "邮箱连接测试")
     @RequestMapping("connect-test")
     public ResultVo connectTest(@RequestBody MailboxInfoVO mailboxInfoVO){
         ResultVo vo = new ResultVo(ResultCode.SUCCESS.getCode());

service-manage/src/main/java/com/simuwang/manage/api/email/EmailNavDetailController.java

@@ -3,6 +3,7 @@ package com.simuwang.manage.api.email;
 import com.simuwang.base.common.support.MybatisPage;
 import com.simuwang.base.pojo.dto.query.ParseDetailPageQuery;
 import com.simuwang.base.pojo.vo.EmailFundNavVO;
+import com.simuwang.logging.SystemLog;
 import com.simuwang.manage.service.ParseEmailDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -24,6 +25,7 @@ public class EmailNavDetailController{
      * @param parseDetailPageQuery
      * @return
      */
+    @SystemLog(value = "净值解析数据详情页面展示查询")
     @GetMapping("/search-nav-detail")
     public MybatisPage<EmailFundNavVO> searchNavDetail(ParseDetailPageQuery parseDetailPageQuery){
         MybatisPage<EmailFundNavVO> result = parseEmailDetailService.searchNavDetail(parseDetailPageQuery);

service-manage/src/main/java/com/simuwang/manage/api/email/ParseEmailController.java

@@ -6,6 +6,7 @@ import com.simuwang.base.pojo.dto.query.EmailFileQuery;
 import com.simuwang.base.pojo.dto.query.EmailParseQuery;
 import com.simuwang.base.pojo.vo.*;
 import com.simuwang.daq.service.EmailParseApiService;
+import com.simuwang.logging.SystemLog;
 import com.simuwang.manage.service.ParseEmailService;
 import com.smppw.common.pojo.ResultVo;
 import com.smppw.common.pojo.enums.TimeRange;
@@ -55,6 +56,7 @@ public class ParseEmailController{
      * @param
      * @return
      */
+    @SystemLog(value = "查询邮件类型识别配置")
     @GetMapping("/search-email-type")
     public ResultVo searchEmailType(){
         EmailTypeRuleVO emailTypeRuleVO = parseEmailService.searchEmailType();
@@ -66,6 +68,7 @@ public class ParseEmailController{
      * @param emailParseQuery
      * @return
      */
+    @SystemLog(value = "邮箱配置页面展示查询")
     @GetMapping("/search-email-list")
     public MybatisPage<EmailParseInfoVO> searchEmailList(EmailParseQuery emailParseQuery){
         MybatisPage<EmailParseInfoVO> result = parseEmailService.searchEmailList(emailParseQuery);
@@ -77,6 +80,7 @@ public class ParseEmailController{
      * @param emailFileQuery
      * @return
      */
+    @SystemLog(value = "详情查询")
     @GetMapping("/detail")
     public MybatisPage<EmailParseDetailVO> searchEmailDetail(EmailFileQuery emailFileQuery){
         MybatisPage<EmailParseDetailVO> result = parseEmailService.searchEmailDetailById(emailFileQuery);
@@ -88,6 +92,7 @@ public class ParseEmailController{
      * @param timeRange Last1Week-近一周,Last1Month-近一个月，Last3Months-近三月，LastHalfYear-近半年，Last1Year-近一年,FromSetup-全部，Custom-自定义
      * @return
      */
+    @SystemLog(value = "解析邮件数据统计")
     @GetMapping("/search-email-count")
     public ResultVo searchEmailCount(@RequestParam("timeRange") TimeRange timeRange,@RequestParam(value = "startDate",required = false)String startDate,@RequestParam(value = "endDate",required = false)String endDate){
         Map<String,Integer> result = parseEmailService.searchEmailCount(timeRange,startDate,endDate);
@@ -99,6 +104,7 @@ public class ParseEmailController{
      * @param fileId
      * @return
      */
+    @SystemLog(value = "下载邮件附件")
     @PostMapping("/download-email-file")
     public void downloadEmailFile(@RequestParam("fileId") Integer fileId, HttpServletResponse response, HttpServletRequest request){
         try {
@@ -124,6 +130,7 @@ public class ParseEmailController{
      * @param idListVO
      * @return
      */
+    @SystemLog(value = "根据邮件ID重新解析")
     @PostMapping("/reparse")
     public ResultVo reparse(@RequestBody IdListVO idListVO){
         for(Integer emailid : idListVO.getIdList()){

service-manage/src/main/java/com/simuwang/manage/api/fund/FunAliasController.java

@@ -5,6 +5,7 @@ import com.simuwang.base.pojo.dto.query.FundAliasPageQuery;
 import com.simuwang.base.pojo.vo.FundAliasVO;
 import com.simuwang.base.pojo.vo.IdListVO;
 import com.simuwang.base.pojo.vo.IdVO;
+import com.simuwang.logging.SystemLog;
 import com.simuwang.manage.service.FundAliasService;
 import com.smppw.common.pojo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +29,7 @@ public class FunAliasController {
      * @param fundAliasPageQuery
      * @return
      */
+    @SystemLog(value = "查询基金别名列表")
     @GetMapping("/fund-alias-list")
     public MybatisPage<FundAliasVO> searchFundAlias(FundAliasPageQuery fundAliasPageQuery){
         MybatisPage<FundAliasVO> result = fundAliasService.searchFundAlias(fundAliasPageQuery);
@@ -39,6 +41,7 @@ public class FunAliasController {
      * @param idVO
      * @return
      */
+    @SystemLog(value = "根据ID查询基金别名")
     @GetMapping("/search-fund-alias")
     public ResultVo<FundAliasVO> searchFundAlias(IdVO idVO){
         FundAliasVO result = fundAliasService.searchFundAliasById(idVO.getId());
@@ -50,6 +53,7 @@ public class FunAliasController {
      * @param fundAliasVO
      * @return
      */
+    @SystemLog(value = "保存基金别名")
     @PostMapping("/save-fund-alias")
     public ResultVo saveFundAlias(@RequestBody FundAliasVO fundAliasVO){
         fundAliasService.saveFundAlias(fundAliasVO);
@@ -61,6 +65,7 @@ public class FunAliasController {
      * @param idListVO
      * @return
      */
+    @SystemLog(value = "删除基金别名")
     @PostMapping("/delete-fund-alias")
     public ResultVo deleteFundAlias(@RequestBody IdListVO idListVO){
         fundAliasService.deleteFundAlias(idListVO);

service-manage/src/main/java/com/simuwang/manage/api/fund/FundInformationController.java

@@ -8,6 +8,7 @@ import com.simuwang.base.pojo.vo.FundFileInfoVO;
 import com.simuwang.base.pojo.vo.FundInfoSearchVO;
 import com.simuwang.base.pojo.vo.FundInformationVO;
 import com.simuwang.base.pojo.vo.FundReportFrequencyVO;
+import com.simuwang.logging.SystemLog;
 import com.simuwang.manage.service.EmailFundInfoService;
 import com.simuwang.manage.service.FundInformationService;
 import com.simuwang.manage.service.FundReportFrequencyService;
@@ -54,6 +55,7 @@ public class FundInformationController{
      * @param fundInfoPageQuery
      * @return
      */
+    @SystemLog(value = "基金页面展示查询")
     @RequestMapping("search-list")
     public MybatisPage<FundInformationVO> searchFundInfoList(FundInfoPageQuery fundInfoPageQuery){
         MybatisPage<FundInformationVO> result = fundInformationService.searchFundInfoList(fundInfoPageQuery);
@@ -65,6 +67,7 @@ public class FundInformationController{
      * @param fundReportFrequency
      * @return
      */
+    @SystemLog(value = "保存基金报送频率")
     @PostMapping("/save-frequency")
     public boolean saveFundReportFrequency(@RequestBody FundReportFrequencyVO fundReportFrequency){
         fundReportFrequencyService.saveFundReportFrequency(fundReportFrequency);
@@ -76,6 +79,7 @@ public class FundInformationController{
      * @param fundFilePageQuery
      * @return
      */
+    @SystemLog(value = "查询基金关联的数据文件")
     @GetMapping("/search-fund-file")
     public MybatisPage<FundFileInfoVO> searchFundFileInfo(FundFilePageQuery fundFilePageQuery){
         MybatisPage<FundFileInfoVO> result = emailFundInfoService.searchFundFileInfo(fundFilePageQuery);

service-manage/src/main/java/com/simuwang/manage/api/navAsset/FundNavAssetController.java

@@ -4,6 +4,7 @@ import com.simuwang.base.common.support.MybatisPage;
 import com.simuwang.base.pojo.dto.query.DistributionPageQuery;
 import com.simuwang.base.pojo.dto.query.FundNavAssetPageQuery;
 import com.simuwang.base.pojo.vo.*;
+import com.simuwang.logging.SystemLog;
 import com.simuwang.manage.service.FundNavAssetService;
 import com.smppw.common.pojo.ResultVo;
 import jakarta.servlet.http.HttpServletRequest;
@@ -30,6 +31,7 @@ public class FundNavAssetController {
      * @param fundNavAssetPageQuery
      * @return
      */
+    @SystemLog(value = "基金净值规模页面展示查询")
     @RequestMapping("search-nav-asset-list")
     public MybatisPage<FundNavAssetVO> searchNavAssetList(FundNavAssetPageQuery fundNavAssetPageQuery){
         MybatisPage<FundNavAssetVO> result = fundNavAssetService.searchNavAssetList(fundNavAssetPageQuery);
@@ -41,6 +43,7 @@ public class FundNavAssetController {
      * @param fundAssetVO
      * @return
      */
+    @SystemLog(value = "新增基金规模")
     @PostMapping("/save-fund-asset")
     public ResultVo saveFundAsset(@RequestBody FundAssetVO fundAssetVO){
         fundNavAssetService.saveFundAsset(fundAssetVO);
@@ -52,12 +55,13 @@ public class FundNavAssetController {
      * @param fundNavVO
      * @return
      */
+    @SystemLog(value = "新增基金规模")
     @PostMapping("/save-fund-nav")
     public ResultVo saveFundNav(@RequestBody FundNavVO fundNavVO){
         fundNavAssetService.saveFundNav(fundNavVO);
         return ResultVo.ok(true);
     }
-
+    @SystemLog(value = "删除基金规模")
     @RequestMapping("/delete-fund-nav-asset")
     public ResultVo deleteFundNavAsset(@RequestBody FundNavAssetDelListVO fundNavAssetDelListVO){
         fundNavAssetService.deleteFundNavAsset(fundNavAssetDelListVO);
@@ -71,6 +75,7 @@ public class FundNavAssetController {
      * @param request
      * @return
      */
+    @SystemLog(value = "上传分红信息")
     @RequestMapping("upload-nav-asset")
     public ResultVo uploadNavAsset(@RequestParam(value = "file",required = false) MultipartFile file, HttpServletResponse response, HttpServletRequest request){
         ResultVo vo = fundNavAssetService.uploadNavAsset(file);

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);
         }
     }
 

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

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;
     }
 

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);
         }
     }
 }

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);
         }
     }
 

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());

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;
                 }
                 //不包含的话，默认取每周的最后一个交易日作为周净值日期