merge

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

@@ -44,6 +44,10 @@ public interface ProductApi {
     @GetMapping("/product/list")
     CommonResp<List<ProductInfoVO>> getProductList(@ApiParam("产品id") @RequestParam("ids") List<String> ids);
 
+    @ApiOperation("获取产品详情")
+    @GetMapping("/product/not/net")
+    CommonResp<List<ProductInfoVO>> getProductListNotNetInfo(@ApiParam("产品id") @RequestParam("ids") List<String> ids);
+
     @ApiOperation("单位净值")
     @GetMapping("/unit/net")
     CommonResp<UnitNetVO> getUnitNetInfo(@ApiParam("产品id") @RequestParam("id") String id, @ApiParam("对比基金id") @RequestParam(value = "ratioId", required = false) String ratioId,

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

@@ -48,6 +48,11 @@ public class ProductController implements ProductApi {
         return CommonResp.success(this.productService.getProductDetail(id));
     }
 
+    @Override
+    public CommonResp<List<ProductInfoVO>> getProductListNotNetInfo(List<String> ids) {
+        return CommonResp.success(this.productService.getProductListNotNet(ids));
+    }
+
     @Override
     public CommonResp<List<ProductInfoVO>> getProductList(List<String> ids) {
         return CommonResp.success(this.productService.getProductList(ids));

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

 package com.tanpu.fund.entity.generator;
 
 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
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class IfaImportedNonavFund {
     /**
     * id
@@ -18,6 +44,16 @@ public class IfaImportedNonavFund {
     */
     private String startEndDate;
 
+    /**
+    * 产品概要
+    */
+    private String summary;
+
+    /**
+    * 产品详情
+    */
+    private String detail;
+
     /**
     * 创建时间
     */
@@ -43,16 +79,6 @@ public class IfaImportedNonavFund {
     */
     private String orgId;
 
-    /**
-    * 产品概要
-    */
-    private String summary;
-
-    /**
-    * 产品详情
-    */
-    private String detail;
-
     /**
     * 基金附件pdf
     */
@@ -62,100 +88,4 @@ public class IfaImportedNonavFund {
     * 基金图片
     */
     private String fundPng;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getFundName() {
-        return fundName;
-    }
-
-    public void setFundName(String fundName) {
-        this.fundName = fundName;
-    }
-
-    public String getStartEndDate() {
-        return startEndDate;
-    }
-
-    public void setStartEndDate(String startEndDate) {
-        this.startEndDate = startEndDate;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Integer getDeleteTag() {
-        return deleteTag;
-    }
-
-    public void setDeleteTag(Integer deleteTag) {
-        this.deleteTag = deleteTag;
-    }
-
-    public String getIfaId() {
-        return ifaId;
-    }
-
-    public void setIfaId(String ifaId) {
-        this.ifaId = ifaId;
-    }
-
-    public String getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(String orgId) {
-        this.orgId = orgId;
-    }
-
-    public String getSummary() {
-        return summary;
-    }
-
-    public void setSummary(String summary) {
-        this.summary = summary;
-    }
-
-    public String getDetail() {
-        return detail;
-    }
-
-    public void setDetail(String detail) {
-        this.detail = detail;
-    }
-
-    public String getFundFile() {
-        return fundFile;
-    }
-
-    public void setFundFile(String fundFile) {
-        this.fundFile = fundFile;
-    }
-
-    public String getFundPng() {
-        return fundPng;
-    }
-
-    public void setFundPng(String fundPng) {
-        this.fundPng = fundPng;
-    }
-}
\ No newline at end of file
+}

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

@@ -4,6 +4,24 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 public class IfaImportedNonavFundExample {
     protected String orderByClause;
 
@@ -315,6 +333,146 @@ public class IfaImportedNonavFundExample {
             return (Criteria) this;
         }
 
+        public Criteria andSummaryIsNull() {
+            addCriterion("summary is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSummaryIsNotNull() {
+            addCriterion("summary is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSummaryEqualTo(String value) {
+            addCriterion("summary =", value, "summary");
+            return (Criteria) this;
+        }
+
+        public Criteria andSummaryNotEqualTo(String value) {
+            addCriterion("summary <>", value, "summary");
+            return (Criteria) this;
+        }
+
+        public Criteria andSummaryGreaterThan(String value) {
+            addCriterion("summary >", value, "summary");
+            return (Criteria) this;
+        }
+
+        public Criteria andSummaryGreaterThanOrEqualTo(String value) {
+            addCriterion("summary >=", value, "summary");
+            return (Criteria) this;
+        }
+
+        public Criteria andSummaryLessThan(String value) {
+            addCriterion("summary <", value, "summary");
+            return (Criteria) this;
+        }
+
+        public Criteria andSummaryLessThanOrEqualTo(String value) {
+            addCriterion("summary <=", value, "summary");
+            return (Criteria) this;
+        }
+
+        public Criteria andSummaryLike(String value) {
+            addCriterion("summary like", value, "summary");
+            return (Criteria) this;
+        }
+
+        public Criteria andSummaryNotLike(String value) {
+            addCriterion("summary not like", value, "summary");
+            return (Criteria) this;
+        }
+
+        public Criteria andSummaryIn(List<String> values) {
+            addCriterion("summary in", values, "summary");
+            return (Criteria) this;
+        }
+
+        public Criteria andSummaryNotIn(List<String> values) {
+            addCriterion("summary not in", values, "summary");
+            return (Criteria) this;
+        }
+
+        public Criteria andSummaryBetween(String value1, String value2) {
+            addCriterion("summary between", value1, value2, "summary");
+            return (Criteria) this;
+        }
+
+        public Criteria andSummaryNotBetween(String value1, String value2) {
+            addCriterion("summary not between", value1, value2, "summary");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailIsNull() {
+            addCriterion("detail is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailIsNotNull() {
+            addCriterion("detail is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailEqualTo(String value) {
+            addCriterion("detail =", value, "detail");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailNotEqualTo(String value) {
+            addCriterion("detail <>", value, "detail");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailGreaterThan(String value) {
+            addCriterion("detail >", value, "detail");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailGreaterThanOrEqualTo(String value) {
+            addCriterion("detail >=", value, "detail");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailLessThan(String value) {
+            addCriterion("detail <", value, "detail");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailLessThanOrEqualTo(String value) {
+            addCriterion("detail <=", value, "detail");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailLike(String value) {
+            addCriterion("detail like", value, "detail");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailNotLike(String value) {
+            addCriterion("detail not like", value, "detail");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailIn(List<String> values) {
+            addCriterion("detail in", values, "detail");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailNotIn(List<String> values) {
+            addCriterion("detail not in", values, "detail");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailBetween(String value1, String value2) {
+            addCriterion("detail between", value1, value2, "detail");
+            return (Criteria) this;
+        }
+
+        public Criteria andDetailNotBetween(String value1, String value2) {
+            addCriterion("detail not between", value1, value2, "detail");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateTimeIsNull() {
             addCriterion("create_time is null");
             return (Criteria) this;
@@ -634,6 +792,146 @@ public class IfaImportedNonavFundExample {
             addCriterion("org_id not between", value1, value2, "orgId");
             return (Criteria) this;
         }
+
+        public Criteria andFundFileIsNull() {
+            addCriterion("fund_file is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundFileIsNotNull() {
+            addCriterion("fund_file is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundFileEqualTo(String value) {
+            addCriterion("fund_file =", value, "fundFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundFileNotEqualTo(String value) {
+            addCriterion("fund_file <>", value, "fundFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundFileGreaterThan(String value) {
+            addCriterion("fund_file >", value, "fundFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundFileGreaterThanOrEqualTo(String value) {
+            addCriterion("fund_file >=", value, "fundFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundFileLessThan(String value) {
+            addCriterion("fund_file <", value, "fundFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundFileLessThanOrEqualTo(String value) {
+            addCriterion("fund_file <=", value, "fundFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundFileLike(String value) {
+            addCriterion("fund_file like", value, "fundFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundFileNotLike(String value) {
+            addCriterion("fund_file not like", value, "fundFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundFileIn(List<String> values) {
+            addCriterion("fund_file in", values, "fundFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundFileNotIn(List<String> values) {
+            addCriterion("fund_file not in", values, "fundFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundFileBetween(String value1, String value2) {
+            addCriterion("fund_file between", value1, value2, "fundFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundFileNotBetween(String value1, String value2) {
+            addCriterion("fund_file not between", value1, value2, "fundFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundPngIsNull() {
+            addCriterion("fund_png is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundPngIsNotNull() {
+            addCriterion("fund_png is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundPngEqualTo(String value) {
+            addCriterion("fund_png =", value, "fundPng");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundPngNotEqualTo(String value) {
+            addCriterion("fund_png <>", value, "fundPng");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundPngGreaterThan(String value) {
+            addCriterion("fund_png >", value, "fundPng");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundPngGreaterThanOrEqualTo(String value) {
+            addCriterion("fund_png >=", value, "fundPng");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundPngLessThan(String value) {
+            addCriterion("fund_png <", value, "fundPng");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundPngLessThanOrEqualTo(String value) {
+            addCriterion("fund_png <=", value, "fundPng");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundPngLike(String value) {
+            addCriterion("fund_png like", value, "fundPng");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundPngNotLike(String value) {
+            addCriterion("fund_png not like", value, "fundPng");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundPngIn(List<String> values) {
+            addCriterion("fund_png in", values, "fundPng");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundPngNotIn(List<String> values) {
+            addCriterion("fund_png not in", values, "fundPng");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundPngBetween(String value1, String value2) {
+            addCriterion("fund_png between", value1, value2, "fundPng");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundPngNotBetween(String value1, String value2) {
+            addCriterion("fund_png not between", value1, value2, "fundPng");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {
@@ -728,4 +1026,4 @@ public class IfaImportedNonavFundExample {
             this(condition, value, secondValue, null);
         }
     }
-}
\ No newline at end of file
+}

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

@@ -6,70 +6,50 @@ 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
+ */
 @Mapper
 public interface IfaImportedNonavFundMapper {
     long countByExample(IfaImportedNonavFundExample example);
 
     int deleteByExample(IfaImportedNonavFundExample 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(IfaImportedNonavFund record);
 
     int insertOrUpdate(IfaImportedNonavFund record);
 
     int insertOrUpdateSelective(IfaImportedNonavFund record);
 
-    int insertOrUpdateWithBLOBs(IfaImportedNonavFund record);
-
-    /**
-     * insert record to table selective
-     * @param record the record
-     * @return insert count
-     */
     int insertSelective(IfaImportedNonavFund record);
 
-    List<IfaImportedNonavFund> selectByExampleWithBLOBs(IfaImportedNonavFundExample example);
-
     List<IfaImportedNonavFund> selectByExample(IfaImportedNonavFundExample example);
 
-    /**
-     * select by primary key
-     * @param id primary key
-     * @return object by primary key
-     */
     IfaImportedNonavFund selectByPrimaryKey(String id);
 
     int updateByExampleSelective(@Param("record") IfaImportedNonavFund record, @Param("example") IfaImportedNonavFundExample example);
 
-    int updateByExampleWithBLOBs(@Param("record") IfaImportedNonavFund record, @Param("example") IfaImportedNonavFundExample example);
-
     int updateByExample(@Param("record") IfaImportedNonavFund record, @Param("example") IfaImportedNonavFundExample example);
 
-    /**
-     * update record selective
-     * @param record the updated record
-     * @return update count
-     */
     int updateByPrimaryKeySelective(IfaImportedNonavFund record);
 
-    int updateByPrimaryKeyWithBLOBs(IfaImportedNonavFund record);
-
-    /**
-     * update record
-     * @param record the updated record
-     * @return update count
-     */
     int updateByPrimaryKey(IfaImportedNonavFund record);
 
     int updateBatch(List<IfaImportedNonavFund> list);
@@ -77,4 +57,4 @@ public interface IfaImportedNonavFundMapper {
     int updateBatchSelective(List<IfaImportedNonavFund> list);
 
     int batchInsert(@Param("list") List<IfaImportedNonavFund> list);
-}
\ No newline at end of file
+}

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

@@ -38,6 +38,7 @@ public interface ProductService {
 
     Page<NetVO> getNetList(NetReq req);
 
+
     List<BonusRatioVO> getBonusRatio(String id);
 
     List<TrackRecordVO> getTrackRecord(String id);
@@ -68,6 +69,8 @@ public interface ProductService {
 
     List<ProductInfoVO> getPrivateFundList(List<String> ids);
 
+    List<ProductInfoVO> getProductListNotNet(List<String> ids);
+
     List<FundInfoSimpleListResp> getSimpleList(List<String> idList);
 
     List<FundInfoSimpleListResp> getPrivateSimpleList(List<String> idList);

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

 package com.tanpu.fund.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
@@ -122,6 +123,9 @@ public class ProductServiceImpl implements ProductService, Constant {
     @Resource
     private FeignForProduct product;
 
+    @Resource
+    private IfaImportedNonavFundMapper ifaImportedNonavFundMapper;
+
     @Override
     public Page<ProductInfoVO> getProductList(ProductInfoReq req) {
 
@@ -1555,6 +1559,25 @@ public class ProductServiceImpl implements ProductService, Constant {
                         multiply100(fundCount.getStddevIncep()), multiply100(fundCount.getSharperatioIncep()), multiply100(fundCount.getRetIncepA())));
     }
 
+    @Override
+    public List<ProductInfoVO> getProductListNotNet(List<String> ids) {
+        IfaImportedNonavFundExample example = new IfaImportedNonavFundExample();
+        example.createCriteria().andIdIn(ids).andDeleteTagEqualTo(0);
+        List<IfaImportedNonavFund> ifaImportedNonavFunds = this.ifaImportedNonavFundMapper.selectByExample(example);
+        if (CollUtil.isEmpty(ifaImportedNonavFunds)) {
+            return new ArrayList<>(0);
+        }
+        return ifaImportedNonavFunds.stream().map(ls -> {
+            ProductInfoVO vo = new ProductInfoVO();
+            vo.setFundId(ls.getId());
+            vo.setProductType(4);
+            vo.setFundName(ls.getFundName());
+            vo.setProductName(ls.getFundName());
+            vo.setFundFile(ls.getFundFile());
+            return vo;
+        }).collect(Collectors.toList());
+    }
+
     @Override
     public List<ProductInfoVO> getPrivateFundList(List<String> ids) {
 

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

@@ -3,21 +3,17 @@
 <mapper namespace="com.tanpu.fund.mapper.generator.IfaImportedNonavFundMapper">
   <resultMap id="BaseResultMap" type="com.tanpu.fund.entity.generator.IfaImportedNonavFund">
     <!--@mbg.generated-->
-    <!--@Table tamp_fund.ifa_imported_nonav_fund-->
+    <!--@Table ifa_imported_nonav_fund-->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="fund_name" jdbcType="VARCHAR" property="fundName" />
     <result column="start_end_date" jdbcType="VARCHAR" property="startEndDate" />
+    <result column="summary" jdbcType="LONGVARCHAR" property="summary" />
+    <result column="detail" jdbcType="LONGVARCHAR" property="detail" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="delete_tag" jdbcType="INTEGER" property="deleteTag" />
     <result column="ifa_id" jdbcType="VARCHAR" property="ifaId" />
     <result column="org_id" jdbcType="VARCHAR" property="orgId" />
-  </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.tanpu.fund.entity.generator.IfaImportedNonavFund">
-    <!--@mbg.generated-->
-    <!--@Table tamp_fund.ifa_imported_nonav_fund-->
-    <result column="summary" jdbcType="LONGVARCHAR" property="summary" />
-    <result column="detail" jdbcType="LONGVARCHAR" property="detail" />
     <result column="fund_file" jdbcType="LONGVARCHAR" property="fundFile" />
     <result column="fund_png" jdbcType="LONGVARCHAR" property="fundPng" />
   </resultMap>
@@ -83,29 +79,9 @@
   </sql>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, fund_name, start_end_date, create_time, update_time, delete_tag, ifa_id, org_id
+    id, fund_name, start_end_date, summary, detail, create_time, update_time, delete_tag,
+    ifa_id, org_id, fund_file, fund_png
   </sql>
-  <sql id="Blob_Column_List">
-    <!--@mbg.generated-->
-    summary, detail, fund_file, fund_png
-  </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.tanpu.fund.entity.generator.IfaImportedNonavFundExample" resultMap="ResultMapWithBLOBs">
-    <!--@mbg.generated-->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from tamp_fund.ifa_imported_nonav_fund
-    <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.IfaImportedNonavFundExample" resultMap="BaseResultMap">
     <!--@mbg.generated-->
     select
@@ -113,7 +89,7 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from tamp_fund.ifa_imported_nonav_fund
+    from ifa_imported_nonav_fund
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -121,43 +97,41 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     <!--@mbg.generated-->
-    select 
+    select
     <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from tamp_fund.ifa_imported_nonav_fund
+    from ifa_imported_nonav_fund
     where id = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     <!--@mbg.generated-->
-    delete from tamp_fund.ifa_imported_nonav_fund
+    delete from ifa_imported_nonav_fund
     where id = #{id,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="com.tanpu.fund.entity.generator.IfaImportedNonavFundExample">
     <!--@mbg.generated-->
-    delete from tamp_fund.ifa_imported_nonav_fund
+    delete from ifa_imported_nonav_fund
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
   <insert id="insert" parameterType="com.tanpu.fund.entity.generator.IfaImportedNonavFund">
     <!--@mbg.generated-->
-    insert into tamp_fund.ifa_imported_nonav_fund (id, fund_name, start_end_date, 
-      create_time, update_time, delete_tag, 
-      ifa_id, org_id, summary, 
-      detail, fund_file, fund_png
+    insert into ifa_imported_nonav_fund (id, fund_name, start_end_date,
+      summary, detail, create_time,
+      update_time, delete_tag, ifa_id,
+      org_id, fund_file, fund_png
       )
-    values (#{id,jdbcType=VARCHAR}, #{fundName,jdbcType=VARCHAR}, #{startEndDate,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{deleteTag,jdbcType=INTEGER}, 
-      #{ifaId,jdbcType=VARCHAR}, #{orgId,jdbcType=VARCHAR}, #{summary,jdbcType=LONGVARCHAR}, 
-      #{detail,jdbcType=LONGVARCHAR}, #{fundFile,jdbcType=LONGVARCHAR}, #{fundPng,jdbcType=LONGVARCHAR}
+    values (#{id,jdbcType=VARCHAR}, #{fundName,jdbcType=VARCHAR}, #{startEndDate,jdbcType=VARCHAR},
+      #{summary,jdbcType=LONGVARCHAR}, #{detail,jdbcType=LONGVARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+      #{updateTime,jdbcType=TIMESTAMP}, #{deleteTag,jdbcType=INTEGER}, #{ifaId,jdbcType=VARCHAR},
+      #{orgId,jdbcType=VARCHAR}, #{fundFile,jdbcType=LONGVARCHAR}, #{fundPng,jdbcType=LONGVARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.tanpu.fund.entity.generator.IfaImportedNonavFund">
     <!--@mbg.generated-->
-    insert into tamp_fund.ifa_imported_nonav_fund
+    insert into ifa_imported_nonav_fund
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
@@ -168,6 +142,12 @@
       <if test="startEndDate != null">
         start_end_date,
       </if>
+      <if test="summary != null">
+        summary,
+      </if>
+      <if test="detail != null">
+        detail,
+      </if>
       <if test="createTime != null">
         create_time,
       </if>
@@ -183,12 +163,6 @@
       <if test="orgId != null">
         org_id,
       </if>
-      <if test="summary != null">
-        summary,
-      </if>
-      <if test="detail != null">
-        detail,
-      </if>
       <if test="fundFile != null">
         fund_file,
       </if>
@@ -206,6 +180,12 @@
       <if test="startEndDate != null">
         #{startEndDate,jdbcType=VARCHAR},
       </if>
+      <if test="summary != null">
+        #{summary,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="detail != null">
+        #{detail,jdbcType=LONGVARCHAR},
+      </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -221,12 +201,6 @@
       <if test="orgId != null">
         #{orgId,jdbcType=VARCHAR},
       </if>
-      <if test="summary != null">
-        #{summary,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="detail != null">
-        #{detail,jdbcType=LONGVARCHAR},
-      </if>
       <if test="fundFile != null">
         #{fundFile,jdbcType=LONGVARCHAR},
       </if>
@@ -237,14 +211,14 @@
   </insert>
   <select id="countByExample" parameterType="com.tanpu.fund.entity.generator.IfaImportedNonavFundExample" resultType="java.lang.Long">
     <!--@mbg.generated-->
-    select count(*) from tamp_fund.ifa_imported_nonav_fund
+    select count(*) from ifa_imported_nonav_fund
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
   <update id="updateByExampleSelective" parameterType="map">
     <!--@mbg.generated-->
-    update tamp_fund.ifa_imported_nonav_fund
+    update ifa_imported_nonav_fund
     <set>
       <if test="record.id != null">
         id = #{record.id,jdbcType=VARCHAR},
@@ -255,6 +229,12 @@
       <if test="record.startEndDate != null">
         start_end_date = #{record.startEndDate,jdbcType=VARCHAR},
       </if>
+      <if test="record.summary != null">
+        summary = #{record.summary,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.detail != null">
+        detail = #{record.detail,jdbcType=LONGVARCHAR},
+      </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
@@ -270,12 +250,6 @@
       <if test="record.orgId != null">
         org_id = #{record.orgId,jdbcType=VARCHAR},
       </if>
-      <if test="record.summary != null">
-        summary = #{record.summary,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="record.detail != null">
-        detail = #{record.detail,jdbcType=LONGVARCHAR},
-      </if>
       <if test="record.fundFile != null">
         fund_file = #{record.fundFile,jdbcType=LONGVARCHAR},
       </if>
@@ -287,43 +261,28 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
+  <update id="updateByExample" parameterType="map">
     <!--@mbg.generated-->
-    update tamp_fund.ifa_imported_nonav_fund
+    update ifa_imported_nonav_fund
     set id = #{record.id,jdbcType=VARCHAR},
       fund_name = #{record.fundName,jdbcType=VARCHAR},
       start_end_date = #{record.startEndDate,jdbcType=VARCHAR},
+      summary = #{record.summary,jdbcType=LONGVARCHAR},
+      detail = #{record.detail,jdbcType=LONGVARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       delete_tag = #{record.deleteTag,jdbcType=INTEGER},
       ifa_id = #{record.ifaId,jdbcType=VARCHAR},
       org_id = #{record.orgId,jdbcType=VARCHAR},
-      summary = #{record.summary,jdbcType=LONGVARCHAR},
-      detail = #{record.detail,jdbcType=LONGVARCHAR},
       fund_file = #{record.fundFile,jdbcType=LONGVARCHAR},
       fund_png = #{record.fundPng,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExample" parameterType="map">
-    <!--@mbg.generated-->
-    update tamp_fund.ifa_imported_nonav_fund
-    set id = #{record.id,jdbcType=VARCHAR},
-      fund_name = #{record.fundName,jdbcType=VARCHAR},
-      start_end_date = #{record.startEndDate,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      delete_tag = #{record.deleteTag,jdbcType=INTEGER},
-      ifa_id = #{record.ifaId,jdbcType=VARCHAR},
-      org_id = #{record.orgId,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.tanpu.fund.entity.generator.IfaImportedNonavFund">
     <!--@mbg.generated-->
-    update tamp_fund.ifa_imported_nonav_fund
+    update ifa_imported_nonav_fund
     <set>
       <if test="fundName != null">
         fund_name = #{fundName,jdbcType=VARCHAR},
@@ -331,6 +290,12 @@
       <if test="startEndDate != null">
         start_end_date = #{startEndDate,jdbcType=VARCHAR},
       </if>
+      <if test="summary != null">
+        summary = #{summary,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="detail != null">
+        detail = #{detail,jdbcType=LONGVARCHAR},
+      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -346,12 +311,6 @@
       <if test="orgId != null">
         org_id = #{orgId,jdbcType=VARCHAR},
       </if>
-      <if test="summary != null">
-        summary = #{summary,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="detail != null">
-        detail = #{detail,jdbcType=LONGVARCHAR},
-      </if>
       <if test="fundFile != null">
         fund_file = #{fundFile,jdbcType=LONGVARCHAR},
       </if>
@@ -361,37 +320,25 @@
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.tanpu.fund.entity.generator.IfaImportedNonavFund">
+  <update id="updateByPrimaryKey" parameterType="com.tanpu.fund.entity.generator.IfaImportedNonavFund">
     <!--@mbg.generated-->
-    update tamp_fund.ifa_imported_nonav_fund
+    update ifa_imported_nonav_fund
     set fund_name = #{fundName,jdbcType=VARCHAR},
       start_end_date = #{startEndDate,jdbcType=VARCHAR},
+      summary = #{summary,jdbcType=LONGVARCHAR},
+      detail = #{detail,jdbcType=LONGVARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       delete_tag = #{deleteTag,jdbcType=INTEGER},
       ifa_id = #{ifaId,jdbcType=VARCHAR},
       org_id = #{orgId,jdbcType=VARCHAR},
-      summary = #{summary,jdbcType=LONGVARCHAR},
-      detail = #{detail,jdbcType=LONGVARCHAR},
       fund_file = #{fundFile,jdbcType=LONGVARCHAR},
       fund_png = #{fundPng,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.tanpu.fund.entity.generator.IfaImportedNonavFund">
-    <!--@mbg.generated-->
-    update tamp_fund.ifa_imported_nonav_fund
-    set fund_name = #{fundName,jdbcType=VARCHAR},
-      start_end_date = #{startEndDate,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      delete_tag = #{deleteTag,jdbcType=INTEGER},
-      ifa_id = #{ifaId,jdbcType=VARCHAR},
-      org_id = #{orgId,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
   <update id="updateBatch" parameterType="java.util.List">
     <!--@mbg.generated-->
-    update tamp_fund.ifa_imported_nonav_fund
+    update ifa_imported_nonav_fund
     <trim prefix="set" suffixOverrides=",">
       <trim prefix="fund_name = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
@@ -403,6 +350,16 @@
           when id = #{item.id,jdbcType=VARCHAR} then #{item.startEndDate,jdbcType=VARCHAR}
         </foreach>
       </trim>
+      <trim prefix="summary = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.summary,jdbcType=LONGVARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="detail = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.detail,jdbcType=LONGVARCHAR}
+        </foreach>
+      </trim>
       <trim prefix="create_time = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           when id = #{item.id,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
@@ -428,16 +385,6 @@
           when id = #{item.id,jdbcType=VARCHAR} then #{item.orgId,jdbcType=VARCHAR}
         </foreach>
       </trim>
-      <trim prefix="summary = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=VARCHAR} then #{item.summary,jdbcType=LONGVARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="detail = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=VARCHAR} then #{item.detail,jdbcType=LONGVARCHAR}
-        </foreach>
-      </trim>
       <trim prefix="fund_file = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           when id = #{item.id,jdbcType=VARCHAR} then #{item.fundFile,jdbcType=LONGVARCHAR}
@@ -456,7 +403,7 @@
   </update>
   <update id="updateBatchSelective" parameterType="java.util.List">
     <!--@mbg.generated-->
-    update tamp_fund.ifa_imported_nonav_fund
+    update ifa_imported_nonav_fund
     <trim prefix="set" suffixOverrides=",">
       <trim prefix="fund_name = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
@@ -472,6 +419,20 @@
           </if>
         </foreach>
       </trim>
+      <trim prefix="summary = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.summary != null">
+            when id = #{item.id,jdbcType=VARCHAR} then #{item.summary,jdbcType=LONGVARCHAR}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="detail = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.detail != null">
+            when id = #{item.id,jdbcType=VARCHAR} then #{item.detail,jdbcType=LONGVARCHAR}
+          </if>
+        </foreach>
+      </trim>
       <trim prefix="create_time = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           <if test="item.createTime != null">
@@ -507,20 +468,6 @@
           </if>
         </foreach>
       </trim>
-      <trim prefix="summary = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.summary != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.summary,jdbcType=LONGVARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="detail = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.detail != null">
-            when id = #{item.id,jdbcType=VARCHAR} then #{item.detail,jdbcType=LONGVARCHAR}
-          </if>
-        </foreach>
-      </trim>
       <trim prefix="fund_file = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           <if test="item.fundFile != null">
@@ -543,65 +490,46 @@
   </update>
   <insert id="batchInsert" parameterType="map">
     <!--@mbg.generated-->
-    insert into tamp_fund.ifa_imported_nonav_fund
-    (id, fund_name, start_end_date, create_time, update_time, delete_tag, ifa_id, org_id, 
-      summary, detail, fund_file, fund_png)
+    insert into ifa_imported_nonav_fund
+    (id, fund_name, start_end_date, summary, detail, create_time, update_time, delete_tag,
+      ifa_id, org_id, fund_file, fund_png)
     values
     <foreach collection="list" item="item" separator=",">
-      (#{item.id,jdbcType=VARCHAR}, #{item.fundName,jdbcType=VARCHAR}, #{item.startEndDate,jdbcType=VARCHAR}, 
-        #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.deleteTag,jdbcType=INTEGER}, 
-        #{item.ifaId,jdbcType=VARCHAR}, #{item.orgId,jdbcType=VARCHAR}, #{item.summary,jdbcType=LONGVARCHAR}, 
-        #{item.detail,jdbcType=LONGVARCHAR}, #{item.fundFile,jdbcType=LONGVARCHAR}, #{item.fundPng,jdbcType=LONGVARCHAR}
+      (#{item.id,jdbcType=VARCHAR}, #{item.fundName,jdbcType=VARCHAR}, #{item.startEndDate,jdbcType=VARCHAR},
+        #{item.summary,jdbcType=LONGVARCHAR}, #{item.detail,jdbcType=LONGVARCHAR}, #{item.createTime,jdbcType=TIMESTAMP},
+        #{item.updateTime,jdbcType=TIMESTAMP}, #{item.deleteTag,jdbcType=INTEGER}, #{item.ifaId,jdbcType=VARCHAR},
+        #{item.orgId,jdbcType=VARCHAR}, #{item.fundFile,jdbcType=LONGVARCHAR}, #{item.fundPng,jdbcType=LONGVARCHAR}
         )
     </foreach>
   </insert>
   <insert id="insertOrUpdate" parameterType="com.tanpu.fund.entity.generator.IfaImportedNonavFund">
     <!--@mbg.generated-->
-    insert into tamp_fund.ifa_imported_nonav_fund
-    (id, fund_name, start_end_date, create_time, update_time, delete_tag, ifa_id, org_id
-      )
-    values
-    (#{id,jdbcType=VARCHAR}, #{fundName,jdbcType=VARCHAR}, #{startEndDate,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{deleteTag,jdbcType=INTEGER}, 
-      #{ifaId,jdbcType=VARCHAR}, #{orgId,jdbcType=VARCHAR})
-    on duplicate key update 
-    id = #{id,jdbcType=VARCHAR}, 
-    fund_name = #{fundName,jdbcType=VARCHAR}, 
-    start_end_date = #{startEndDate,jdbcType=VARCHAR}, 
-    create_time = #{createTime,jdbcType=TIMESTAMP}, 
-    update_time = #{updateTime,jdbcType=TIMESTAMP}, 
-    delete_tag = #{deleteTag,jdbcType=INTEGER}, 
-    ifa_id = #{ifaId,jdbcType=VARCHAR}, 
-    org_id = #{orgId,jdbcType=VARCHAR}
-  </insert>
-  <insert id="insertOrUpdateWithBLOBs" parameterType="com.tanpu.fund.entity.generator.IfaImportedNonavFund">
-    <!--@mbg.generated-->
-    insert into tamp_fund.ifa_imported_nonav_fund
-    (id, fund_name, start_end_date, create_time, update_time, delete_tag, ifa_id, org_id, 
-      summary, detail, fund_file, fund_png)
+    insert into ifa_imported_nonav_fund
+    (id, fund_name, start_end_date, summary, detail, create_time, update_time, delete_tag,
+      ifa_id, org_id, fund_file, fund_png)
     values
-    (#{id,jdbcType=VARCHAR}, #{fundName,jdbcType=VARCHAR}, #{startEndDate,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{deleteTag,jdbcType=INTEGER}, 
-      #{ifaId,jdbcType=VARCHAR}, #{orgId,jdbcType=VARCHAR}, #{summary,jdbcType=LONGVARCHAR}, 
-      #{detail,jdbcType=LONGVARCHAR}, #{fundFile,jdbcType=LONGVARCHAR}, #{fundPng,jdbcType=LONGVARCHAR}
+    (#{id,jdbcType=VARCHAR}, #{fundName,jdbcType=VARCHAR}, #{startEndDate,jdbcType=VARCHAR},
+      #{summary,jdbcType=LONGVARCHAR}, #{detail,jdbcType=LONGVARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+      #{updateTime,jdbcType=TIMESTAMP}, #{deleteTag,jdbcType=INTEGER}, #{ifaId,jdbcType=VARCHAR},
+      #{orgId,jdbcType=VARCHAR}, #{fundFile,jdbcType=LONGVARCHAR}, #{fundPng,jdbcType=LONGVARCHAR}
       )
-    on duplicate key update 
-    id = #{id,jdbcType=VARCHAR}, 
-    fund_name = #{fundName,jdbcType=VARCHAR}, 
-    start_end_date = #{startEndDate,jdbcType=VARCHAR}, 
-    create_time = #{createTime,jdbcType=TIMESTAMP}, 
-    update_time = #{updateTime,jdbcType=TIMESTAMP}, 
-    delete_tag = #{deleteTag,jdbcType=INTEGER}, 
-    ifa_id = #{ifaId,jdbcType=VARCHAR}, 
-    org_id = #{orgId,jdbcType=VARCHAR}, 
-    summary = #{summary,jdbcType=LONGVARCHAR}, 
-    detail = #{detail,jdbcType=LONGVARCHAR}, 
-    fund_file = #{fundFile,jdbcType=LONGVARCHAR}, 
+    on duplicate key update
+    id = #{id,jdbcType=VARCHAR},
+    fund_name = #{fundName,jdbcType=VARCHAR},
+    start_end_date = #{startEndDate,jdbcType=VARCHAR},
+    summary = #{summary,jdbcType=LONGVARCHAR},
+    detail = #{detail,jdbcType=LONGVARCHAR},
+    create_time = #{createTime,jdbcType=TIMESTAMP},
+    update_time = #{updateTime,jdbcType=TIMESTAMP},
+    delete_tag = #{deleteTag,jdbcType=INTEGER},
+    ifa_id = #{ifaId,jdbcType=VARCHAR},
+    org_id = #{orgId,jdbcType=VARCHAR},
+    fund_file = #{fundFile,jdbcType=LONGVARCHAR},
     fund_png = #{fundPng,jdbcType=LONGVARCHAR}
   </insert>
   <insert id="insertOrUpdateSelective" parameterType="com.tanpu.fund.entity.generator.IfaImportedNonavFund">
     <!--@mbg.generated-->
-    insert into tamp_fund.ifa_imported_nonav_fund
+    insert into ifa_imported_nonav_fund
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
@@ -612,6 +540,12 @@
       <if test="startEndDate != null">
         start_end_date,
       </if>
+      <if test="summary != null">
+        summary,
+      </if>
+      <if test="detail != null">
+        detail,
+      </if>
       <if test="createTime != null">
         create_time,
       </if>
@@ -627,12 +561,6 @@
       <if test="orgId != null">
         org_id,
       </if>
-      <if test="summary != null">
-        summary,
-      </if>
-      <if test="detail != null">
-        detail,
-      </if>
       <if test="fundFile != null">
         fund_file,
       </if>
@@ -651,6 +579,12 @@
       <if test="startEndDate != null">
         #{startEndDate,jdbcType=VARCHAR},
       </if>
+      <if test="summary != null">
+        #{summary,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="detail != null">
+        #{detail,jdbcType=LONGVARCHAR},
+      </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -666,12 +600,6 @@
       <if test="orgId != null">
         #{orgId,jdbcType=VARCHAR},
       </if>
-      <if test="summary != null">
-        #{summary,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="detail != null">
-        #{detail,jdbcType=LONGVARCHAR},
-      </if>
       <if test="fundFile != null">
         #{fundFile,jdbcType=LONGVARCHAR},
       </if>
@@ -679,7 +607,7 @@
         #{fundPng,jdbcType=LONGVARCHAR},
       </if>
     </trim>
-    on duplicate key update 
+    on duplicate key update
     <trim suffixOverrides=",">
       <if test="id != null">
         id = #{id,jdbcType=VARCHAR},
@@ -690,6 +618,12 @@
       <if test="startEndDate != null">
         start_end_date = #{startEndDate,jdbcType=VARCHAR},
       </if>
+      <if test="summary != null">
+        summary = #{summary,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="detail != null">
+        detail = #{detail,jdbcType=LONGVARCHAR},
+      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -705,12 +639,6 @@
       <if test="orgId != null">
         org_id = #{orgId,jdbcType=VARCHAR},
       </if>
-      <if test="summary != null">
-        summary = #{summary,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="detail != null">
-        detail = #{detail,jdbcType=LONGVARCHAR},
-      </if>
       <if test="fundFile != null">
         fund_file = #{fundFile,jdbcType=LONGVARCHAR},
       </if>
@@ -719,4 +647,4 @@
       </if>
     </trim>
   </insert>
-</mapper>
\ No newline at end of file
+</mapper>