merge

src/main/java/com/tanpu/fund/api/IfaFundApi.java

+package com.tanpu.fund.api;
+
+import com.tanpu.common.model.fund.req.FundNoNavReq;
+import com.tanpu.common.model.fund.resq.FundNoNavResp;
+import com.tanpu.common.resp.CommonResp;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author zyh
+ * @description 无净值产品
+ */
+public interface IfaFundApi {
+
+    @ApiOperation("新增无净值产品")
+    @PostMapping("/fundnonav/ifa/add")
+    CommonResp fundnonavAdd(@RequestBody FundNoNavReq req);
+
+    @ApiOperation("编辑无净值产品")
+    @PostMapping("/fundnonav/ifa/edit")
+    CommonResp fundnonavEdit(@RequestBody FundNoNavReq req);
+
+    @ApiOperation("查询无净值产品详情")
+    @GetMapping("/fundnonav/ifa/detail")
+    CommonResp<FundNoNavResp> fundnonavDetail(@RequestParam("id") String id);
+}

src/main/java/com/tanpu/fund/controller/IfaFundController.java

+package com.tanpu.fund.controller;
+
+import com.tanpu.common.auth.mapping.TanpuInterfaceLoginAuth;
+import com.tanpu.common.model.fund.req.FundNoNavReq;
+import com.tanpu.common.model.fund.resq.FundNoNavResp;
+import com.tanpu.common.resp.CommonResp;
+import com.tanpu.fund.api.IfaFundApi;
+import com.tanpu.fund.service.IfaFundService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author: zyh
+ * @date: 2021-03-13 2:44 下午
+ * @description:
+ */
+@RestController
+public class IfaFundController implements IfaFundApi {
+
+    @Resource
+    private IfaFundService ifaFundService;
+
+    @TanpuInterfaceLoginAuth
+    @Override
+    public CommonResp fundnonavAdd(FundNoNavReq req) {
+        if (StringUtils.isEmpty(req.getFundName())) {
+            return CommonResp.error(CommonResp.PARAMETER_INVALID_STATUS_CODE, CommonResp.PARAMETER_INVALID_MESSAGE);
+        }
+
+        this.ifaFundService.fundnonavAdd(req);
+        return CommonResp.success();
+    }
+
+    @TanpuInterfaceLoginAuth
+    @Override
+    public CommonResp fundnonavEdit(FundNoNavReq req) {
+        if (StringUtils.isEmpty(req.getId()) || StringUtils.isEmpty(req.getFundName())) {
+            return CommonResp.error(CommonResp.PARAMETER_INVALID_STATUS_CODE, CommonResp.PARAMETER_INVALID_MESSAGE);
+        }
+
+        this.ifaFundService.fundnonavEdit(req);
+        return CommonResp.success();
+    }
+
+    @Override
+    public CommonResp<FundNoNavResp> fundnonavDetail(String id) {
+        if (StringUtils.isEmpty(id)) {
+            return CommonResp.error(CommonResp.PARAMETER_INVALID_STATUS_CODE, CommonResp.PARAMETER_INVALID_MESSAGE);
+        }
+        return CommonResp.success(this.ifaFundService.fundnonavDetail(id));
+    }
+
+}

src/main/java/com/tanpu/fund/entity/generator/IfaImportedFundInfo.java

 package com.tanpu.fund.entity.generator;
 
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-/**
- * @author: zhoupeng
- * <p>
- * =========================================
- * =========================================
- * ========                         ========
- * =======   ==========   =======    =======
- * ======        =====    ==   ====   ======
- * =====        =====     ==    ===    =====
- * =====       =====      ==   ===     =====
- * =====      =====       == ===       =====
- * ======    ==========   ==          ======
- * =======                           =======
- * =========================================
- * =========================================
- * <p>
- * @email: zhoupeng_08@163.com
- */
+import java.math.BigDecimal;
+import java.util.Date;
+
 @Data
 @Builder
 @AllArgsConstructor
@@ -135,4 +118,29 @@ public class IfaImportedFundInfo {
      * 机构id
      */
     private String orgId;
-}
\ No newline at end of file
+
+    /**
+     * 募集开始时间
+     */
+    private Date raiseStarttime;
+
+    /**
+     * 募集结束时间
+     */
+    private Date raiseEndtime;
+
+    /**
+     * 产品类型 0：无净值产品 1：有净值产品
+     */
+    private Integer proSubType;
+
+    /**
+     * 产品摘要
+     */
+    private String proAbstract;
+
+    /**
+     * 产品详情
+     */
+    private String proInfoDesc;
+}

src/main/java/com/tanpu/fund/entity/generator/IfaImportedFundInfoExample.java

@@ -5,24 +5,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-/**
- * @author: zhoupeng
- * <p>
- * =========================================
- * =========================================
- * ========                         ========
- * =======   ==========   =======    =======
- * ======        =====    ==   ====   ======
- * =====        =====     ==    ===    =====
- * =====       =====      ==   ===     =====
- * =====      =====       == ===       =====
- * ======    ==========   ==          ======
- * =======                           =======
- * =========================================
- * =========================================
- * <p>
- * @email: zhoupeng_08@163.com
- */
 public class IfaImportedFundInfoExample {
     protected String orderByClause;
 
@@ -1803,6 +1785,186 @@ public class IfaImportedFundInfoExample {
             addCriterion("org_id not between", value1, value2, "orgId");
             return (Criteria) this;
         }
+
+        public Criteria andRaiseStarttimeIsNull() {
+            addCriterion("raise_starttime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRaiseStarttimeIsNotNull() {
+            addCriterion("raise_starttime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRaiseStarttimeEqualTo(Date value) {
+            addCriterion("raise_starttime =", value, "raiseStarttime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRaiseStarttimeNotEqualTo(Date value) {
+            addCriterion("raise_starttime <>", value, "raiseStarttime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRaiseStarttimeGreaterThan(Date value) {
+            addCriterion("raise_starttime >", value, "raiseStarttime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRaiseStarttimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("raise_starttime >=", value, "raiseStarttime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRaiseStarttimeLessThan(Date value) {
+            addCriterion("raise_starttime <", value, "raiseStarttime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRaiseStarttimeLessThanOrEqualTo(Date value) {
+            addCriterion("raise_starttime <=", value, "raiseStarttime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRaiseStarttimeIn(List<Date> values) {
+            addCriterion("raise_starttime in", values, "raiseStarttime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRaiseStarttimeNotIn(List<Date> values) {
+            addCriterion("raise_starttime not in", values, "raiseStarttime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRaiseStarttimeBetween(Date value1, Date value2) {
+            addCriterion("raise_starttime between", value1, value2, "raiseStarttime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRaiseStarttimeNotBetween(Date value1, Date value2) {
+            addCriterion("raise_starttime not between", value1, value2, "raiseStarttime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRaiseEndtimeIsNull() {
+            addCriterion("raise_endtime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRaiseEndtimeIsNotNull() {
+            addCriterion("raise_endtime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRaiseEndtimeEqualTo(Date value) {
+            addCriterion("raise_endtime =", value, "raiseEndtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRaiseEndtimeNotEqualTo(Date value) {
+            addCriterion("raise_endtime <>", value, "raiseEndtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRaiseEndtimeGreaterThan(Date value) {
+            addCriterion("raise_endtime >", value, "raiseEndtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRaiseEndtimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("raise_endtime >=", value, "raiseEndtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRaiseEndtimeLessThan(Date value) {
+            addCriterion("raise_endtime <", value, "raiseEndtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRaiseEndtimeLessThanOrEqualTo(Date value) {
+            addCriterion("raise_endtime <=", value, "raiseEndtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRaiseEndtimeIn(List<Date> values) {
+            addCriterion("raise_endtime in", values, "raiseEndtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRaiseEndtimeNotIn(List<Date> values) {
+            addCriterion("raise_endtime not in", values, "raiseEndtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRaiseEndtimeBetween(Date value1, Date value2) {
+            addCriterion("raise_endtime between", value1, value2, "raiseEndtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRaiseEndtimeNotBetween(Date value1, Date value2) {
+            addCriterion("raise_endtime not between", value1, value2, "raiseEndtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andProSubTypeIsNull() {
+            addCriterion("pro_sub_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProSubTypeIsNotNull() {
+            addCriterion("pro_sub_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProSubTypeEqualTo(Integer value) {
+            addCriterion("pro_sub_type =", value, "proSubType");
+            return (Criteria) this;
+        }
+
+        public Criteria andProSubTypeNotEqualTo(Integer value) {
+            addCriterion("pro_sub_type <>", value, "proSubType");
+            return (Criteria) this;
+        }
+
+        public Criteria andProSubTypeGreaterThan(Integer value) {
+            addCriterion("pro_sub_type >", value, "proSubType");
+            return (Criteria) this;
+        }
+
+        public Criteria andProSubTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("pro_sub_type >=", value, "proSubType");
+            return (Criteria) this;
+        }
+
+        public Criteria andProSubTypeLessThan(Integer value) {
+            addCriterion("pro_sub_type <", value, "proSubType");
+            return (Criteria) this;
+        }
+
+        public Criteria andProSubTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("pro_sub_type <=", value, "proSubType");
+            return (Criteria) this;
+        }
+
+        public Criteria andProSubTypeIn(List<Integer> values) {
+            addCriterion("pro_sub_type in", values, "proSubType");
+            return (Criteria) this;
+        }
+
+        public Criteria andProSubTypeNotIn(List<Integer> values) {
+            addCriterion("pro_sub_type not in", values, "proSubType");
+            return (Criteria) this;
+        }
+
+        public Criteria andProSubTypeBetween(Integer value1, Integer value2) {
+            addCriterion("pro_sub_type between", value1, value2, "proSubType");
+            return (Criteria) this;
+        }
+
+        public Criteria andProSubTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("pro_sub_type not between", value1, value2, "proSubType");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {
@@ -1897,4 +2059,4 @@ public class IfaImportedFundInfoExample {
             this(condition, value, secondValue, null);
         }
     }
-}
\ No newline at end of file
+}

src/main/java/com/tanpu/fund/feign/user/FeignClientForFatools.java

 package com.tanpu.fund.feign.user;
 
+import com.tanpu.common.model.file.req.FileQueryReq;
+import com.tanpu.common.model.file.req.FileSaveReq;
+import com.tanpu.common.model.file.resp.FileQueryResp;
 import com.tanpu.common.model.product.resp.ProductLabel;
 import com.tanpu.common.model.product.resp.UserInfoVo;
 import com.tanpu.common.model.user.resp.ColumnVO;
@@ -10,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.validation.Valid;
@@ -39,4 +43,11 @@ public interface FeignClientForFatools {
     @GetMapping("/batch/get/label")
     CommonResp<Map<String, List<ProductLabel>>> batchGetLabelByIdInfo(@RequestParam("list")@Valid @NotEmpty List<String> list);
 
+    @ApiOperation(value = "保存关联附件")
+    @PostMapping(value = "/file/save", produces = {"application/json"})
+    CommonResp fileSave(@RequestBody FileSaveReq req);
+
+    @ApiOperation(value = "查询附件")
+    @GetMapping(value = "/file/query", produces = {"application/json"})
+    CommonResp<List<FileQueryResp>> fileQuery(@RequestBody FileQueryReq req);
 }

src/main/java/com/tanpu/fund/feign/user/FeignbackForFatools.java

 package com.tanpu.fund.feign.user;
 
 import com.alibaba.fastjson.JSON;
+import com.tanpu.common.model.file.req.FileQueryReq;
+import com.tanpu.common.model.file.req.FileSaveReq;
+import com.tanpu.common.model.file.resp.FileQueryResp;
 import com.tanpu.common.model.product.resp.ProductLabel;
 import com.tanpu.common.model.product.resp.UserInfoVo;
 import com.tanpu.common.model.user.resp.ColumnVO;
@@ -57,6 +60,20 @@ public class FeignbackForFatools implements FallbackFactory<FeignClientForFatool
                 log.error("FeignClientForUser.getColumnInfo 查询栏目失败 id:{}", JSON.toJSONString(list));
                 return null;
             }
+
+            @Override
+            public CommonResp fileSave(FileSaveReq req) {
+                log.error("请求信息", throwable);
+                log.error("FeignClientForUser.fileSave 查询栏目失败 id:{}", JSON.toJSONString(req));
+                return null;
+            }
+
+            @Override
+            public CommonResp<List<FileQueryResp>> fileQuery(FileQueryReq req) {
+                log.error("请求信息", throwable);
+                log.error("FeignClientForUser.fileQuery 查询栏目失败 id:{}", JSON.toJSONString(req));
+                return null;
+            }
         };
     }
 

src/main/java/com/tanpu/fund/mapper/generator/IfaImportedFundInfoMapper.java

@@ -2,59 +2,84 @@ package com.tanpu.fund.mapper.generator;
 
 import com.tanpu.fund.entity.generator.IfaImportedFundInfo;
 import com.tanpu.fund.entity.generator.IfaImportedFundInfoExample;
-import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-/**
- * @author: zhoupeng
- * <p>
- * =========================================
- * =========================================
- * ========                         ========
- * =======   ==========   =======    =======
- * ======        =====    ==   ====   ======
- * =====        =====     ==    ===    =====
- * =====       =====      ==   ===     =====
- * =====      =====       == ===       =====
- * ======    ==========   ==          ======
- * =======                           =======
- * =========================================
- * =========================================
- * <p>
- * @email: zhoupeng_08@163.com
- */
+import java.util.List;
+
 @Mapper
 public interface IfaImportedFundInfoMapper {
     long countByExample(IfaImportedFundInfoExample example);
 
     int deleteByExample(IfaImportedFundInfoExample example);
 
+    /**
+     * delete by primary key
+     *
+     * @param id primaryKey
+     * @return deleteCount
+     */
     int deleteByPrimaryKey(String id);
 
+    /**
+     * insert record to table
+     *
+     * @param record the record
+     * @return insert count
+     */
     int insert(IfaImportedFundInfo record);
 
     int insertOrUpdate(IfaImportedFundInfo record);
 
     int insertOrUpdateSelective(IfaImportedFundInfo record);
 
+    int insertOrUpdateWithBLOBs(IfaImportedFundInfo record);
+
+    /**
+     * insert record to table selective
+     *
+     * @param record the record
+     * @return insert count
+     */
     int insertSelective(IfaImportedFundInfo record);
 
+    List<IfaImportedFundInfo> selectByExampleWithBLOBs(IfaImportedFundInfoExample example);
+
     List<IfaImportedFundInfo> selectByExample(IfaImportedFundInfoExample example);
 
+    /**
+     * select by primary key
+     *
+     * @param id primary key
+     * @return object by primary key
+     */
     IfaImportedFundInfo selectByPrimaryKey(String id);
 
     int updateByExampleSelective(@Param("record") IfaImportedFundInfo record, @Param("example") IfaImportedFundInfoExample example);
 
+    int updateByExampleWithBLOBs(@Param("record") IfaImportedFundInfo record, @Param("example") IfaImportedFundInfoExample example);
+
     int updateByExample(@Param("record") IfaImportedFundInfo record, @Param("example") IfaImportedFundInfoExample example);
 
+    /**
+     * update record selective
+     *
+     * @param record the updated record
+     * @return update count
+     */
     int updateByPrimaryKeySelective(IfaImportedFundInfo record);
 
+    int updateByPrimaryKeyWithBLOBs(IfaImportedFundInfo record);
+
+    /**
+     * update record
+     *
+     * @param record the updated record
+     * @return update count
+     */
     int updateByPrimaryKey(IfaImportedFundInfo record);
 
     int updateBatch(List<IfaImportedFundInfo> list);
 
-    int updateBatchSelective(List<IfaImportedFundInfo> list);
-
     int batchInsert(@Param("list") List<IfaImportedFundInfo> list);
-}
\ No newline at end of file
+}

src/main/java/com/tanpu/fund/service/IfaFundService.java

+package com.tanpu.fund.service;
+
+import com.tanpu.common.model.fund.req.FundNoNavReq;
+import com.tanpu.common.model.fund.resq.FundNoNavResp;
+
+/**
+ * @author: zyh
+ * @date: 2021-03-13 2:45 下午
+ * @description:
+ */
+public interface IfaFundService {
+    void fundnonavAdd(FundNoNavReq req);
+
+    void fundnonavEdit(FundNoNavReq req);
+
+    FundNoNavResp fundnonavDetail(String id);
+}

src/main/java/com/tanpu/fund/service/impl/IfaFundServieImpl.java

+package com.tanpu.fund.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.tanpu.common.auth.UserInfoThreadLocalHolder;
+import com.tanpu.common.enums.BizEnums;
+import com.tanpu.common.enums.FileTypeEnums;
+import com.tanpu.common.model.file.req.FileQueryReq;
+import com.tanpu.common.model.file.req.FileSaveReq;
+import com.tanpu.common.model.file.resp.FileQueryResp;
+import com.tanpu.common.model.fund.req.FundNoNavReq;
+import com.tanpu.common.model.fund.resq.FundNoNavResp;
+import com.tanpu.common.resp.CommonResp;
+import com.tanpu.common.utils.SnowFlakeUtil;
+import com.tanpu.fund.entity.generator.IfaImportedFundInfo;
+import com.tanpu.fund.feign.user.FeignClientForFatools;
+import com.tanpu.fund.mapper.generator.IfaImportedFundInfoMapper;
+import com.tanpu.fund.service.IfaFundService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author: zyh
+ * @date: 2021-03-13 2:46 下午
+ * @description:
+ */
+@Service
+public class IfaFundServieImpl implements IfaFundService {
+
+    @Resource
+    private SnowFlakeUtil snowFlakeUtil;
+    @Resource
+    private IfaImportedFundInfoMapper ifaImportedFundInfoMapper;
+    @Resource
+    private FeignClientForFatools feignClientForFatools;
+
+    @Override
+    public void fundnonavAdd(FundNoNavReq req) {
+        IfaImportedFundInfo p = new IfaImportedFundInfo();
+        BeanUtils.copyProperties(req, p);
+        p.setId(snowFlakeUtil.uniqueLong());
+        p.setRaiseStarttime(req.getRaiseStarttime());
+        p.setRaiseEndtime(req.getRaiseEndtime());
+        p.setIfaId(UserInfoThreadLocalHolder.getserInfo().getId());
+        p.setCreateBy(UserInfoThreadLocalHolder.getserInfo().getId());
+        p.setCreateTime(new Date());
+        p.setDeleteTag(BizEnums.DeleteTag.tag_init);
+        ifaImportedFundInfoMapper.insertSelective(p);
+
+        //保存附件
+        if (CollectionUtil.isNotEmpty(req.getProInfoDescPics())) {
+            feignClientForFatools.fileSave(FileSaveReq.builder().refId(p.getId()).fileIds(req.getProInfoDescPics()).build());
+        }
+
+        if (CollectionUtil.isNotEmpty(req.getProFileDatas())) {
+            feignClientForFatools.fileSave(FileSaveReq.builder().refId(p.getId()).fileIds(req.getProFileDatas()).build());
+        }
+    }
+
+    @Override
+    public void fundnonavEdit(FundNoNavReq req) {
+        IfaImportedFundInfo p = new IfaImportedFundInfo();
+        BeanUtils.copyProperties(req, p);
+        p.setRaiseStarttime(req.getRaiseStarttime());
+        p.setRaiseEndtime(req.getRaiseEndtime());
+        p.setIfaId(UserInfoThreadLocalHolder.getserInfo().getId());
+        p.setUpdateBy(UserInfoThreadLocalHolder.getserInfo().getId());
+        p.setUpdateTime(new Date());
+        p.setDeleteTag(BizEnums.DeleteTag.tag_init);
+        ifaImportedFundInfoMapper.updateByPrimaryKey(p);
+
+        //保存附件
+        if (CollectionUtil.isNotEmpty(req.getProInfoDescPics())) {
+            feignClientForFatools.fileSave(FileSaveReq.builder().refId(p.getId()).fileIds(req.getProInfoDescPics()).build());
+        }
+
+        if (CollectionUtil.isNotEmpty(req.getProFileDatas())) {
+            feignClientForFatools.fileSave(FileSaveReq.builder().refId(p.getId()).fileIds(req.getProFileDatas()).build());
+        }
+    }
+
+    @Override
+    public FundNoNavResp fundnonavDetail(String id) {
+        IfaImportedFundInfo ifaImportedFundInfo = ifaImportedFundInfoMapper.selectByPrimaryKey(id);
+        FundNoNavResp p = new FundNoNavResp();
+        BeanUtils.copyProperties(ifaImportedFundInfo, p);
+        p.setRaiseStarttime(ifaImportedFundInfo.getRaiseStarttime() != null ? ifaImportedFundInfo.getRaiseStarttime().getTime() : null);
+        p.setRaiseEndtime(ifaImportedFundInfo.getRaiseEndtime() != null ? ifaImportedFundInfo.getRaiseEndtime().getTime() : null);
+
+        //详情图片
+        {
+            CommonResp<List<FileQueryResp>> commonResp = feignClientForFatools.fileQuery(FileQueryReq.builder().refId(id)
+                    .fileType(FileTypeEnums.fundnonavdetail.name()).build());
+            if (commonResp.isSuccess()) {
+                p.setProInfoDescPics(commonResp.getAttributes());
+            }
+        }
+
+        //资料
+        {
+            CommonResp<List<FileQueryResp>> commonResp = feignClientForFatools.fileQuery(FileQueryReq.builder().refId(id)
+                    .fileType(FileTypeEnums.fundnonavdatas.name()).build());
+            if (commonResp.isSuccess()) {
+                p.setProFileDatas(commonResp.getAttributes());
+            }
+        }
+
+        return p;
+    }
+
+}

src/main/resources/mybatis/generator/IfaImportedFundInfoMapper.xml

@@ -30,6 +30,15 @@
     <result column="delete_tag" jdbcType="INTEGER" property="deleteTag" />
     <result column="nav_frequency" jdbcType="INTEGER" property="navFrequency" />
     <result column="org_id" jdbcType="VARCHAR" property="orgId" />
+    <result column="raise_starttime" jdbcType="TIMESTAMP" property="raiseStarttime" />
+    <result column="raise_endtime" jdbcType="TIMESTAMP" property="raiseEndtime" />
+    <result column="pro_sub_type" jdbcType="INTEGER" property="proSubType" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.tanpu.fund.entity.generator.IfaImportedFundInfo">
+    <!--@mbg.generated-->
+    <!--@Table ifa_imported_fund_info-->
+    <result column="pro_abstract" jdbcType="LONGVARCHAR" property="proAbstract" />
+    <result column="pro_info_desc" jdbcType="LONGVARCHAR" property="proInfoDesc" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--@mbg.generated-->
@@ -93,12 +102,33 @@
   </sql>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, fund_name, company_name, substrategy, strategy, manage_name, risk_level, inception_date, 
-    register_number, open_day, min_investment_share, subsequent_investment_share, subscription_fee, 
-    redemption_fee, management_fee, performance_fee, performance_calculate_method, ifa_id, 
-    has_nav, create_time, create_by, update_time, update_by, delete_tag, nav_frequency, 
-    org_id
+    id, fund_name, company_name, substrategy, strategy, manage_name, risk_level, inception_date,
+    register_number, open_day, min_investment_share, subsequent_investment_share, subscription_fee,
+    redemption_fee, management_fee, performance_fee, performance_calculate_method, ifa_id,
+    has_nav, create_time, create_by, update_time, update_by, delete_tag, nav_frequency,
+    org_id, raise_starttime, raise_endtime, pro_sub_type
   </sql>
+  <sql id="Blob_Column_List">
+    <!--@mbg.generated-->
+    pro_abstract, pro_info_desc
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.tanpu.fund.entity.generator.IfaImportedFundInfoExample" resultMap="ResultMapWithBLOBs">
+    <!--@mbg.generated-->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from ifa_imported_fund_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
   <select id="selectByExample" parameterType="com.tanpu.fund.entity.generator.IfaImportedFundInfoExample" resultMap="BaseResultMap">
     <!--@mbg.generated-->
     select
@@ -114,10 +144,12 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
     <!--@mbg.generated-->
-    select 
+    select
     <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
     from ifa_imported_fund_info
     where id = #{id,jdbcType=VARCHAR}
   </select>
@@ -135,26 +167,28 @@
   </delete>
   <insert id="insert" parameterType="com.tanpu.fund.entity.generator.IfaImportedFundInfo">
     <!--@mbg.generated-->
-    insert into ifa_imported_fund_info (id, fund_name, company_name, 
-      substrategy, strategy, manage_name, 
-      risk_level, inception_date, register_number, 
-      open_day, min_investment_share, subsequent_investment_share, 
-      subscription_fee, redemption_fee, management_fee, 
-      performance_fee, performance_calculate_method, 
-      ifa_id, has_nav, create_time, 
-      create_by, update_time, update_by, 
-      delete_tag, nav_frequency, org_id
-      )
-    values (#{id,jdbcType=VARCHAR}, #{fundName,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
-      #{substrategy,jdbcType=INTEGER}, #{strategy,jdbcType=INTEGER}, #{manageName,jdbcType=VARCHAR}, 
-      #{riskLevel,jdbcType=VARCHAR}, #{inceptionDate,jdbcType=TIMESTAMP}, #{registerNumber,jdbcType=VARCHAR}, 
-      #{openDay,jdbcType=VARCHAR}, #{minInvestmentShare,jdbcType=DECIMAL}, #{subsequentInvestmentShare,jdbcType=DECIMAL}, 
-      #{subscriptionFee,jdbcType=DECIMAL}, #{redemptionFee,jdbcType=DECIMAL}, #{managementFee,jdbcType=DECIMAL}, 
-      #{performanceFee,jdbcType=DECIMAL}, #{performanceCalculateMethod,jdbcType=VARCHAR}, 
-      #{ifaId,jdbcType=VARCHAR}, #{hasNav,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{createBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, 
-      #{deleteTag,jdbcType=INTEGER}, #{navFrequency,jdbcType=INTEGER}, #{orgId,jdbcType=VARCHAR}
-      )
+    insert into ifa_imported_fund_info (id, fund_name, company_name,
+      substrategy, strategy, manage_name,
+      risk_level, inception_date, register_number,
+      open_day, min_investment_share, subsequent_investment_share,
+      subscription_fee, redemption_fee, management_fee,
+      performance_fee, performance_calculate_method,
+      ifa_id, has_nav, create_time,
+      create_by, update_time, update_by,
+      delete_tag, nav_frequency, org_id,
+      raise_starttime, raise_endtime, pro_sub_type,
+      pro_abstract, pro_info_desc)
+    values (#{id,jdbcType=VARCHAR}, #{fundName,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR},
+      #{substrategy,jdbcType=INTEGER}, #{strategy,jdbcType=INTEGER}, #{manageName,jdbcType=VARCHAR},
+      #{riskLevel,jdbcType=VARCHAR}, #{inceptionDate,jdbcType=TIMESTAMP}, #{registerNumber,jdbcType=VARCHAR},
+      #{openDay,jdbcType=VARCHAR}, #{minInvestmentShare,jdbcType=DECIMAL}, #{subsequentInvestmentShare,jdbcType=DECIMAL},
+      #{subscriptionFee,jdbcType=DECIMAL}, #{redemptionFee,jdbcType=DECIMAL}, #{managementFee,jdbcType=DECIMAL},
+      #{performanceFee,jdbcType=DECIMAL}, #{performanceCalculateMethod,jdbcType=VARCHAR},
+      #{ifaId,jdbcType=VARCHAR}, #{hasNav,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
+      #{createBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR},
+      #{deleteTag,jdbcType=INTEGER}, #{navFrequency,jdbcType=INTEGER}, #{orgId,jdbcType=VARCHAR},
+      #{raiseStarttime,jdbcType=TIMESTAMP}, #{raiseEndtime,jdbcType=TIMESTAMP}, #{proSubType,jdbcType=INTEGER},
+      #{proAbstract,jdbcType=LONGVARCHAR}, #{proInfoDesc,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.tanpu.fund.entity.generator.IfaImportedFundInfo">
     <!--@mbg.generated-->
@@ -238,6 +272,21 @@
       <if test="orgId != null">
         org_id,
       </if>
+      <if test="raiseStarttime != null">
+        raise_starttime,
+      </if>
+      <if test="raiseEndtime != null">
+        raise_endtime,
+      </if>
+      <if test="proSubType != null">
+        pro_sub_type,
+      </if>
+      <if test="proAbstract != null">
+        pro_abstract,
+      </if>
+      <if test="proInfoDesc != null">
+        pro_info_desc,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -318,6 +367,21 @@
       <if test="orgId != null">
         #{orgId,jdbcType=VARCHAR},
       </if>
+      <if test="raiseStarttime != null">
+        #{raiseStarttime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="raiseEndtime != null">
+        #{raiseEndtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="proSubType != null">
+        #{proSubType,jdbcType=INTEGER},
+      </if>
+      <if test="proAbstract != null">
+        #{proAbstract,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="proInfoDesc != null">
+        #{proInfoDesc,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.tanpu.fund.entity.generator.IfaImportedFundInfoExample" resultType="java.lang.Long">
@@ -409,12 +473,27 @@
       <if test="record.orgId != null">
         org_id = #{record.orgId,jdbcType=VARCHAR},
       </if>
+      <if test="record.raiseStarttime != null">
+        raise_starttime = #{record.raiseStarttime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.raiseEndtime != null">
+        raise_endtime = #{record.raiseEndtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.proSubType != null">
+        pro_sub_type = #{record.proSubType,jdbcType=INTEGER},
+      </if>
+      <if test="record.proAbstract != null">
+        pro_abstract = #{record.proAbstract,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.proInfoDesc != null">
+        pro_info_desc = #{record.proInfoDesc,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExample" parameterType="map">
+  <update id="updateByExampleWithBLOBs" parameterType="map">
     <!--@mbg.generated-->
     update ifa_imported_fund_info
     set id = #{record.id,jdbcType=VARCHAR},
@@ -442,7 +521,47 @@
       update_by = #{record.updateBy,jdbcType=VARCHAR},
       delete_tag = #{record.deleteTag,jdbcType=INTEGER},
       nav_frequency = #{record.navFrequency,jdbcType=INTEGER},
-      org_id = #{record.orgId,jdbcType=VARCHAR}
+      org_id = #{record.orgId,jdbcType=VARCHAR},
+      raise_starttime = #{record.raiseStarttime,jdbcType=TIMESTAMP},
+      raise_endtime = #{record.raiseEndtime,jdbcType=TIMESTAMP},
+      pro_sub_type = #{record.proSubType,jdbcType=INTEGER},
+      pro_abstract = #{record.proAbstract,jdbcType=LONGVARCHAR},
+      pro_info_desc = #{record.proInfoDesc,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--@mbg.generated-->
+    update ifa_imported_fund_info
+    set id = #{record.id,jdbcType=VARCHAR},
+      fund_name = #{record.fundName,jdbcType=VARCHAR},
+      company_name = #{record.companyName,jdbcType=VARCHAR},
+      substrategy = #{record.substrategy,jdbcType=INTEGER},
+      strategy = #{record.strategy,jdbcType=INTEGER},
+      manage_name = #{record.manageName,jdbcType=VARCHAR},
+      risk_level = #{record.riskLevel,jdbcType=VARCHAR},
+      inception_date = #{record.inceptionDate,jdbcType=TIMESTAMP},
+      register_number = #{record.registerNumber,jdbcType=VARCHAR},
+      open_day = #{record.openDay,jdbcType=VARCHAR},
+      min_investment_share = #{record.minInvestmentShare,jdbcType=DECIMAL},
+      subsequent_investment_share = #{record.subsequentInvestmentShare,jdbcType=DECIMAL},
+      subscription_fee = #{record.subscriptionFee,jdbcType=DECIMAL},
+      redemption_fee = #{record.redemptionFee,jdbcType=DECIMAL},
+      management_fee = #{record.managementFee,jdbcType=DECIMAL},
+      performance_fee = #{record.performanceFee,jdbcType=DECIMAL},
+      performance_calculate_method = #{record.performanceCalculateMethod,jdbcType=VARCHAR},
+      ifa_id = #{record.ifaId,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      create_by = #{record.createBy,jdbcType=VARCHAR},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      update_by = #{record.updateBy,jdbcType=VARCHAR},
+      delete_tag = #{record.deleteTag,jdbcType=INTEGER},
+      nav_frequency = #{record.navFrequency,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=VARCHAR},
+      raise_starttime = #{record.raiseStarttime,jdbcType=TIMESTAMP},
+      raise_endtime = #{record.raiseEndtime,jdbcType=TIMESTAMP},
+      pro_sub_type = #{record.proSubType,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -526,10 +645,25 @@
       <if test="orgId != null">
         org_id = #{orgId,jdbcType=VARCHAR},
       </if>
+      <if test="raiseStarttime != null">
+        raise_starttime = #{raiseStarttime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="raiseEndtime != null">
+        raise_endtime = #{raiseEndtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="proSubType != null">
+        pro_sub_type = #{proSubType,jdbcType=INTEGER},
+      </if>
+      <if test="proAbstract != null">
+        pro_abstract = #{proAbstract,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="proInfoDesc != null">
+        pro_info_desc = #{proInfoDesc,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.tanpu.fund.entity.generator.IfaImportedFundInfo">
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.tanpu.fund.entity.generator.IfaImportedFundInfo">
     <!--@mbg.generated-->
     update ifa_imported_fund_info
     set fund_name = #{fundName,jdbcType=VARCHAR},
@@ -556,7 +690,44 @@
       update_by = #{updateBy,jdbcType=VARCHAR},
       delete_tag = #{deleteTag,jdbcType=INTEGER},
       nav_frequency = #{navFrequency,jdbcType=INTEGER},
-      org_id = #{orgId,jdbcType=VARCHAR}
+      org_id = #{orgId,jdbcType=VARCHAR},
+      raise_starttime = #{raiseStarttime,jdbcType=TIMESTAMP},
+      raise_endtime = #{raiseEndtime,jdbcType=TIMESTAMP},
+      pro_sub_type = #{proSubType,jdbcType=INTEGER},
+      pro_abstract = #{proAbstract,jdbcType=LONGVARCHAR},
+      pro_info_desc = #{proInfoDesc,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tanpu.fund.entity.generator.IfaImportedFundInfo">
+    <!--@mbg.generated-->
+    update ifa_imported_fund_info
+    set fund_name = #{fundName,jdbcType=VARCHAR},
+      company_name = #{companyName,jdbcType=VARCHAR},
+      substrategy = #{substrategy,jdbcType=INTEGER},
+      strategy = #{strategy,jdbcType=INTEGER},
+      manage_name = #{manageName,jdbcType=VARCHAR},
+      risk_level = #{riskLevel,jdbcType=VARCHAR},
+      inception_date = #{inceptionDate,jdbcType=TIMESTAMP},
+      register_number = #{registerNumber,jdbcType=VARCHAR},
+      open_day = #{openDay,jdbcType=VARCHAR},
+      min_investment_share = #{minInvestmentShare,jdbcType=DECIMAL},
+      subsequent_investment_share = #{subsequentInvestmentShare,jdbcType=DECIMAL},
+      subscription_fee = #{subscriptionFee,jdbcType=DECIMAL},
+      redemption_fee = #{redemptionFee,jdbcType=DECIMAL},
+      management_fee = #{managementFee,jdbcType=DECIMAL},
+      performance_fee = #{performanceFee,jdbcType=DECIMAL},
+      performance_calculate_method = #{performanceCalculateMethod,jdbcType=VARCHAR},
+      ifa_id = #{ifaId,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      update_by = #{updateBy,jdbcType=VARCHAR},
+      delete_tag = #{deleteTag,jdbcType=INTEGER},
+      nav_frequency = #{navFrequency,jdbcType=INTEGER},
+      org_id = #{orgId,jdbcType=VARCHAR},
+      raise_starttime = #{raiseStarttime,jdbcType=TIMESTAMP},
+      raise_endtime = #{raiseEndtime,jdbcType=TIMESTAMP},
+      pro_sub_type = #{proSubType,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateBatch" parameterType="java.util.List">
@@ -688,189 +859,29 @@
           when id = #{item.id,jdbcType=VARCHAR} then #{item.orgId,jdbcType=VARCHAR}
         </foreach>
       </trim>
-    </trim>
-    where id in
-    <foreach close=")" collection="list" item="item" open="(" separator=", ">
-      #{item.id,jdbcType=VARCHAR}
-    </foreach>
-  </update>
-  <update id="updateBatchSelective" parameterType="java.util.List">
-    <!--@mbg.generated-->
-    update ifa_imported_fund_info
-    <trim prefix="set" suffixOverrides=",">
-      <trim prefix="fund_name = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.fundName != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.fundName,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="company_name = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.companyName != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.companyName,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="substrategy = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.substrategy != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.substrategy,jdbcType=INTEGER}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="strategy = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.strategy != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.strategy,jdbcType=INTEGER}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="manage_name = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.manageName != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.manageName,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="risk_level = case" suffix="end,">
+      <trim prefix="raise_starttime = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
-          <if test="item.riskLevel != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.riskLevel,jdbcType=VARCHAR}
-          </if>
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.raiseStarttime,jdbcType=TIMESTAMP}
         </foreach>
       </trim>
-      <trim prefix="inception_date = case" suffix="end,">
+      <trim prefix="raise_endtime = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
-          <if test="item.inceptionDate != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.inceptionDate,jdbcType=TIMESTAMP}
-          </if>
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.raiseEndtime,jdbcType=TIMESTAMP}
         </foreach>
       </trim>
-      <trim prefix="register_number = case" suffix="end,">
+      <trim prefix="pro_sub_type = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
-          <if test="item.registerNumber != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.registerNumber,jdbcType=VARCHAR}
-          </if>
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.proSubType,jdbcType=INTEGER}
         </foreach>
       </trim>
-      <trim prefix="open_day = case" suffix="end,">
+      <trim prefix="pro_abstract = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
-          <if test="item.openDay != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.openDay,jdbcType=VARCHAR}
-          </if>
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.proAbstract,jdbcType=LONGVARCHAR}
         </foreach>
       </trim>
-      <trim prefix="min_investment_share = case" suffix="end,">
+      <trim prefix="pro_info_desc = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
-          <if test="item.minInvestmentShare != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.minInvestmentShare,jdbcType=DECIMAL}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="subsequent_investment_share = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.subsequentInvestmentShare != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.subsequentInvestmentShare,jdbcType=DECIMAL}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="subscription_fee = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.subscriptionFee != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.subscriptionFee,jdbcType=DECIMAL}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="redemption_fee = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.redemptionFee != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.redemptionFee,jdbcType=DECIMAL}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="management_fee = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.managementFee != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.managementFee,jdbcType=DECIMAL}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="performance_fee = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.performanceFee != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.performanceFee,jdbcType=DECIMAL}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="performance_calculate_method = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.performanceCalculateMethod != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.performanceCalculateMethod,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="ifa_id = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.ifaId != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.ifaId,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="has_nav = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.hasNav != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.hasNav,jdbcType=INTEGER}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="create_time = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.createTime != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="create_by = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.createBy != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.createBy,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="update_time = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.updateTime != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="update_by = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.updateBy != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.updateBy,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="delete_tag = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.deleteTag != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.deleteTag,jdbcType=INTEGER}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="nav_frequency = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.navFrequency != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.navFrequency,jdbcType=INTEGER}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="org_id = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.orgId != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.orgId,jdbcType=VARCHAR}
-          </if>
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.proInfoDesc,jdbcType=LONGVARCHAR}
         </foreach>
       </trim>
     </trim>
@@ -882,72 +893,132 @@
   <insert id="batchInsert" parameterType="map">
     <!--@mbg.generated-->
     insert into ifa_imported_fund_info
-    (id, fund_name, company_name, substrategy, strategy, manage_name, risk_level, inception_date, 
-      register_number, open_day, min_investment_share, subsequent_investment_share, subscription_fee, 
-      redemption_fee, management_fee, performance_fee, performance_calculate_method, 
-      ifa_id, has_nav, create_time, create_by, update_time, update_by, delete_tag, nav_frequency, 
-      org_id)
+    (id, fund_name, company_name, substrategy, strategy, manage_name, risk_level, inception_date,
+      register_number, open_day, min_investment_share, subsequent_investment_share, subscription_fee,
+      redemption_fee, management_fee, performance_fee, performance_calculate_method,
+      ifa_id, has_nav, create_time, create_by, update_time, update_by, delete_tag, nav_frequency,
+      org_id, raise_starttime, raise_endtime, pro_sub_type, pro_abstract, pro_info_desc
+      )
     values
     <foreach collection="list" item="item" separator=",">
-      (#{item.id,jdbcType=VARCHAR}, #{item.fundName,jdbcType=VARCHAR}, #{item.companyName,jdbcType=VARCHAR}, 
-        #{item.substrategy,jdbcType=INTEGER}, #{item.strategy,jdbcType=INTEGER}, #{item.manageName,jdbcType=VARCHAR}, 
-        #{item.riskLevel,jdbcType=VARCHAR}, #{item.inceptionDate,jdbcType=TIMESTAMP}, #{item.registerNumber,jdbcType=VARCHAR}, 
-        #{item.openDay,jdbcType=VARCHAR}, #{item.minInvestmentShare,jdbcType=DECIMAL}, 
-        #{item.subsequentInvestmentShare,jdbcType=DECIMAL}, #{item.subscriptionFee,jdbcType=DECIMAL}, 
-        #{item.redemptionFee,jdbcType=DECIMAL}, #{item.managementFee,jdbcType=DECIMAL}, 
-        #{item.performanceFee,jdbcType=DECIMAL}, #{item.performanceCalculateMethod,jdbcType=VARCHAR}, 
-        #{item.ifaId,jdbcType=VARCHAR}, #{item.hasNav,jdbcType=INTEGER}, #{item.createTime,jdbcType=TIMESTAMP}, 
-        #{item.createBy,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.updateBy,jdbcType=VARCHAR}, 
-        #{item.deleteTag,jdbcType=INTEGER}, #{item.navFrequency,jdbcType=INTEGER}, #{item.orgId,jdbcType=VARCHAR}
-        )
+      (#{item.id,jdbcType=VARCHAR}, #{item.fundName,jdbcType=VARCHAR}, #{item.companyName,jdbcType=VARCHAR},
+        #{item.substrategy,jdbcType=INTEGER}, #{item.strategy,jdbcType=INTEGER}, #{item.manageName,jdbcType=VARCHAR},
+        #{item.riskLevel,jdbcType=VARCHAR}, #{item.inceptionDate,jdbcType=TIMESTAMP}, #{item.registerNumber,jdbcType=VARCHAR},
+        #{item.openDay,jdbcType=VARCHAR}, #{item.minInvestmentShare,jdbcType=DECIMAL},
+        #{item.subsequentInvestmentShare,jdbcType=DECIMAL}, #{item.subscriptionFee,jdbcType=DECIMAL},
+        #{item.redemptionFee,jdbcType=DECIMAL}, #{item.managementFee,jdbcType=DECIMAL},
+        #{item.performanceFee,jdbcType=DECIMAL}, #{item.performanceCalculateMethod,jdbcType=VARCHAR},
+        #{item.ifaId,jdbcType=VARCHAR}, #{item.hasNav,jdbcType=INTEGER}, #{item.createTime,jdbcType=TIMESTAMP},
+        #{item.createBy,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.updateBy,jdbcType=VARCHAR},
+        #{item.deleteTag,jdbcType=INTEGER}, #{item.navFrequency,jdbcType=INTEGER}, #{item.orgId,jdbcType=VARCHAR},
+        #{item.raiseStarttime,jdbcType=TIMESTAMP}, #{item.raiseEndtime,jdbcType=TIMESTAMP},
+        #{item.proSubType,jdbcType=INTEGER}, #{item.proAbstract,jdbcType=LONGVARCHAR},
+        #{item.proInfoDesc,jdbcType=LONGVARCHAR})
     </foreach>
   </insert>
   <insert id="insertOrUpdate" parameterType="com.tanpu.fund.entity.generator.IfaImportedFundInfo">
     <!--@mbg.generated-->
     insert into ifa_imported_fund_info
-    (id, fund_name, company_name, substrategy, strategy, manage_name, risk_level, inception_date, 
-      register_number, open_day, min_investment_share, subsequent_investment_share, subscription_fee, 
-      redemption_fee, management_fee, performance_fee, performance_calculate_method, 
-      ifa_id, has_nav, create_time, create_by, update_time, update_by, delete_tag, nav_frequency, 
-      org_id)
+    (id, fund_name, company_name, substrategy, strategy, manage_name, risk_level, inception_date,
+      register_number, open_day, min_investment_share, subsequent_investment_share, subscription_fee,
+      redemption_fee, management_fee, performance_fee, performance_calculate_method,
+      ifa_id, has_nav, create_time, create_by, update_time, update_by, delete_tag, nav_frequency,
+      org_id, raise_starttime, raise_endtime, pro_sub_type)
     values
-    (#{id,jdbcType=VARCHAR}, #{fundName,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
-      #{substrategy,jdbcType=INTEGER}, #{strategy,jdbcType=INTEGER}, #{manageName,jdbcType=VARCHAR}, 
-      #{riskLevel,jdbcType=VARCHAR}, #{inceptionDate,jdbcType=TIMESTAMP}, #{registerNumber,jdbcType=VARCHAR}, 
-      #{openDay,jdbcType=VARCHAR}, #{minInvestmentShare,jdbcType=DECIMAL}, #{subsequentInvestmentShare,jdbcType=DECIMAL}, 
-      #{subscriptionFee,jdbcType=DECIMAL}, #{redemptionFee,jdbcType=DECIMAL}, #{managementFee,jdbcType=DECIMAL}, 
-      #{performanceFee,jdbcType=DECIMAL}, #{performanceCalculateMethod,jdbcType=VARCHAR}, 
-      #{ifaId,jdbcType=VARCHAR}, #{hasNav,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{createBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, 
-      #{deleteTag,jdbcType=INTEGER}, #{navFrequency,jdbcType=INTEGER}, #{orgId,jdbcType=VARCHAR}
+    (#{id,jdbcType=VARCHAR}, #{fundName,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR},
+      #{substrategy,jdbcType=INTEGER}, #{strategy,jdbcType=INTEGER}, #{manageName,jdbcType=VARCHAR},
+      #{riskLevel,jdbcType=VARCHAR}, #{inceptionDate,jdbcType=TIMESTAMP}, #{registerNumber,jdbcType=VARCHAR},
+      #{openDay,jdbcType=VARCHAR}, #{minInvestmentShare,jdbcType=DECIMAL}, #{subsequentInvestmentShare,jdbcType=DECIMAL},
+      #{subscriptionFee,jdbcType=DECIMAL}, #{redemptionFee,jdbcType=DECIMAL}, #{managementFee,jdbcType=DECIMAL},
+      #{performanceFee,jdbcType=DECIMAL}, #{performanceCalculateMethod,jdbcType=VARCHAR},
+      #{ifaId,jdbcType=VARCHAR}, #{hasNav,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
+      #{createBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR},
+      #{deleteTag,jdbcType=INTEGER}, #{navFrequency,jdbcType=INTEGER}, #{orgId,jdbcType=VARCHAR},
+      #{raiseStarttime,jdbcType=TIMESTAMP}, #{raiseEndtime,jdbcType=TIMESTAMP}, #{proSubType,jdbcType=INTEGER}
       )
-    on duplicate key update 
-    id = #{id,jdbcType=VARCHAR}, 
-    fund_name = #{fundName,jdbcType=VARCHAR}, 
-    company_name = #{companyName,jdbcType=VARCHAR}, 
-    substrategy = #{substrategy,jdbcType=INTEGER}, 
-    strategy = #{strategy,jdbcType=INTEGER}, 
-    manage_name = #{manageName,jdbcType=VARCHAR}, 
-    risk_level = #{riskLevel,jdbcType=VARCHAR}, 
-    inception_date = #{inceptionDate,jdbcType=TIMESTAMP}, 
-    register_number = #{registerNumber,jdbcType=VARCHAR}, 
-    open_day = #{openDay,jdbcType=VARCHAR}, 
-    min_investment_share = #{minInvestmentShare,jdbcType=DECIMAL}, 
-    subsequent_investment_share = #{subsequentInvestmentShare,jdbcType=DECIMAL}, 
-    subscription_fee = #{subscriptionFee,jdbcType=DECIMAL}, 
-    redemption_fee = #{redemptionFee,jdbcType=DECIMAL}, 
-    management_fee = #{managementFee,jdbcType=DECIMAL}, 
-    performance_fee = #{performanceFee,jdbcType=DECIMAL}, 
-    performance_calculate_method = #{performanceCalculateMethod,jdbcType=VARCHAR}, 
-    ifa_id = #{ifaId,jdbcType=VARCHAR}, 
-    has_nav = #{hasNav,jdbcType=INTEGER}, 
-    create_time = #{createTime,jdbcType=TIMESTAMP}, 
-    create_by = #{createBy,jdbcType=VARCHAR}, 
-    update_time = #{updateTime,jdbcType=TIMESTAMP}, 
-    update_by = #{updateBy,jdbcType=VARCHAR}, 
-    delete_tag = #{deleteTag,jdbcType=INTEGER}, 
-    nav_frequency = #{navFrequency,jdbcType=INTEGER}, 
-    org_id = #{orgId,jdbcType=VARCHAR}
+    on duplicate key update
+    id = #{id,jdbcType=VARCHAR},
+    fund_name = #{fundName,jdbcType=VARCHAR},
+    company_name = #{companyName,jdbcType=VARCHAR},
+    substrategy = #{substrategy,jdbcType=INTEGER},
+    strategy = #{strategy,jdbcType=INTEGER},
+    manage_name = #{manageName,jdbcType=VARCHAR},
+    risk_level = #{riskLevel,jdbcType=VARCHAR},
+    inception_date = #{inceptionDate,jdbcType=TIMESTAMP},
+    register_number = #{registerNumber,jdbcType=VARCHAR},
+    open_day = #{openDay,jdbcType=VARCHAR},
+    min_investment_share = #{minInvestmentShare,jdbcType=DECIMAL},
+    subsequent_investment_share = #{subsequentInvestmentShare,jdbcType=DECIMAL},
+    subscription_fee = #{subscriptionFee,jdbcType=DECIMAL},
+    redemption_fee = #{redemptionFee,jdbcType=DECIMAL},
+    management_fee = #{managementFee,jdbcType=DECIMAL},
+    performance_fee = #{performanceFee,jdbcType=DECIMAL},
+    performance_calculate_method = #{performanceCalculateMethod,jdbcType=VARCHAR},
+    ifa_id = #{ifaId,jdbcType=VARCHAR},
+    has_nav = #{hasNav,jdbcType=INTEGER},
+    create_time = #{createTime,jdbcType=TIMESTAMP},
+    create_by = #{createBy,jdbcType=VARCHAR},
+    update_time = #{updateTime,jdbcType=TIMESTAMP},
+    update_by = #{updateBy,jdbcType=VARCHAR},
+    delete_tag = #{deleteTag,jdbcType=INTEGER},
+    nav_frequency = #{navFrequency,jdbcType=INTEGER},
+    org_id = #{orgId,jdbcType=VARCHAR},
+    raise_starttime = #{raiseStarttime,jdbcType=TIMESTAMP},
+    raise_endtime = #{raiseEndtime,jdbcType=TIMESTAMP},
+    pro_sub_type = #{proSubType,jdbcType=INTEGER}
+  </insert>
+  <insert id="insertOrUpdateWithBLOBs" parameterType="com.tanpu.fund.entity.generator.IfaImportedFundInfo">
+    <!--@mbg.generated-->
+    insert into ifa_imported_fund_info
+    (id, fund_name, company_name, substrategy, strategy, manage_name, risk_level, inception_date,
+      register_number, open_day, min_investment_share, subsequent_investment_share, subscription_fee,
+      redemption_fee, management_fee, performance_fee, performance_calculate_method,
+      ifa_id, has_nav, create_time, create_by, update_time, update_by, delete_tag, nav_frequency,
+      org_id, raise_starttime, raise_endtime, pro_sub_type, pro_abstract, pro_info_desc
+      )
+    values
+    (#{id,jdbcType=VARCHAR}, #{fundName,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR},
+      #{substrategy,jdbcType=INTEGER}, #{strategy,jdbcType=INTEGER}, #{manageName,jdbcType=VARCHAR},
+      #{riskLevel,jdbcType=VARCHAR}, #{inceptionDate,jdbcType=TIMESTAMP}, #{registerNumber,jdbcType=VARCHAR},
+      #{openDay,jdbcType=VARCHAR}, #{minInvestmentShare,jdbcType=DECIMAL}, #{subsequentInvestmentShare,jdbcType=DECIMAL},
+      #{subscriptionFee,jdbcType=DECIMAL}, #{redemptionFee,jdbcType=DECIMAL}, #{managementFee,jdbcType=DECIMAL},
+      #{performanceFee,jdbcType=DECIMAL}, #{performanceCalculateMethod,jdbcType=VARCHAR},
+      #{ifaId,jdbcType=VARCHAR}, #{hasNav,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
+      #{createBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR},
+      #{deleteTag,jdbcType=INTEGER}, #{navFrequency,jdbcType=INTEGER}, #{orgId,jdbcType=VARCHAR},
+      #{raiseStarttime,jdbcType=TIMESTAMP}, #{raiseEndtime,jdbcType=TIMESTAMP}, #{proSubType,jdbcType=INTEGER},
+      #{proAbstract,jdbcType=LONGVARCHAR}, #{proInfoDesc,jdbcType=LONGVARCHAR})
+    on duplicate key update
+    id = #{id,jdbcType=VARCHAR},
+    fund_name = #{fundName,jdbcType=VARCHAR},
+    company_name = #{companyName,jdbcType=VARCHAR},
+    substrategy = #{substrategy,jdbcType=INTEGER},
+    strategy = #{strategy,jdbcType=INTEGER},
+    manage_name = #{manageName,jdbcType=VARCHAR},
+    risk_level = #{riskLevel,jdbcType=VARCHAR},
+    inception_date = #{inceptionDate,jdbcType=TIMESTAMP},
+    register_number = #{registerNumber,jdbcType=VARCHAR},
+    open_day = #{openDay,jdbcType=VARCHAR},
+    min_investment_share = #{minInvestmentShare,jdbcType=DECIMAL},
+    subsequent_investment_share = #{subsequentInvestmentShare,jdbcType=DECIMAL},
+    subscription_fee = #{subscriptionFee,jdbcType=DECIMAL},
+    redemption_fee = #{redemptionFee,jdbcType=DECIMAL},
+    management_fee = #{managementFee,jdbcType=DECIMAL},
+    performance_fee = #{performanceFee,jdbcType=DECIMAL},
+    performance_calculate_method = #{performanceCalculateMethod,jdbcType=VARCHAR},
+    ifa_id = #{ifaId,jdbcType=VARCHAR},
+    create_time = #{createTime,jdbcType=TIMESTAMP},
+    create_by = #{createBy,jdbcType=VARCHAR},
+    update_time = #{updateTime,jdbcType=TIMESTAMP},
+    update_by = #{updateBy,jdbcType=VARCHAR},
+    delete_tag = #{deleteTag,jdbcType=INTEGER},
+    nav_frequency = #{navFrequency,jdbcType=INTEGER},
+    org_id = #{orgId,jdbcType=VARCHAR},
+    raise_starttime = #{raiseStarttime,jdbcType=TIMESTAMP},
+    raise_endtime = #{raiseEndtime,jdbcType=TIMESTAMP},
+    pro_sub_type = #{proSubType,jdbcType=INTEGER},
+    pro_abstract = #{proAbstract,jdbcType=LONGVARCHAR},
+    pro_info_desc = #{proInfoDesc,jdbcType=LONGVARCHAR}
   </insert>
   <insert id="insertOrUpdateSelective" parameterType="com.tanpu.fund.entity.generator.IfaImportedFundInfo">
     <!--@mbg.generated-->
@@ -1031,6 +1102,21 @@
       <if test="orgId != null">
         org_id,
       </if>
+      <if test="raiseStarttime != null">
+        raise_starttime,
+      </if>
+      <if test="raiseEndtime != null">
+        raise_endtime,
+      </if>
+      <if test="proSubType != null">
+        pro_sub_type,
+      </if>
+      <if test="proAbstract != null">
+        pro_abstract,
+      </if>
+      <if test="proInfoDesc != null">
+        pro_info_desc,
+      </if>
     </trim>
     values
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -1112,8 +1198,23 @@
       <if test="orgId != null">
         #{orgId,jdbcType=VARCHAR},
       </if>
+      <if test="raiseStarttime != null">
+        #{raiseStarttime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="raiseEndtime != null">
+        #{raiseEndtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="proSubType != null">
+        #{proSubType,jdbcType=INTEGER},
+      </if>
+      <if test="proAbstract != null">
+        #{proAbstract,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="proInfoDesc != null">
+        #{proInfoDesc,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
-    on duplicate key update 
+    on duplicate key update
     <trim suffixOverrides=",">
       <if test="id != null">
         id = #{id,jdbcType=VARCHAR},
@@ -1193,6 +1294,21 @@
       <if test="orgId != null">
         org_id = #{orgId,jdbcType=VARCHAR},
       </if>
+      <if test="raiseStarttime != null">
+        raise_starttime = #{raiseStarttime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="raiseEndtime != null">
+        raise_endtime = #{raiseEndtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="proSubType != null">
+        pro_sub_type = #{proSubType,jdbcType=INTEGER},
+      </if>
+      <if test="proAbstract != null">
+        pro_abstract = #{proAbstract,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="proInfoDesc != null">
+        pro_info_desc = #{proInfoDesc,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
   </insert>
-</mapper>
\ No newline at end of file
+</mapper>