Merge branch 'v1.3.3' into dev

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

@@ -188,4 +188,10 @@ public interface ProductApi {
     @GetMapping("/private/like")
     CommonResp<List<Type>> getFundLikeShortNameInfo(@Valid @NotEmpty(message = "产品名称不能为空") @RequestParam("productName") String productName,
                                                     Pageable page);
+
+    //**********************************************************私有基金 end**********************************************************
+    @ApiOperation("推荐基金 - 无净值基金")
+    @GetMapping("/noNetfund/query/samefund")
+    CommonResp<List<FundSameResp>> getNoNetfund(@RequestParam("fundId") String fundId);
+
 }

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

@@ -238,4 +238,12 @@ public class ProductController implements ProductApi {
     public CommonResp<List<Type>> getFundLikeShortNameInfo(String productName, Pageable page) {
         return CommonResp.success(this.productService.getFundLikeShortName(productName, page));
     }
+
+    @Override
+    public CommonResp<List<FundSameResp>> getNoNetfund(String fundId) {
+        if (StringUtils.isEmpty(fundId)) {
+            return CommonResp.error(CommonResp.PARAMETER_INVALID_STATUS_CODE, CommonResp.PARAMETER_INVALID_MESSAGE);
+        }
+        return CommonResp.success(this.productService.getNoNetfund(fundId));
+    }
 }

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

+package com.tanpu.fund.entity.generator;
+
+import java.util.Date;
+
+public class IfaImportedNonavFund {
+    /**
+    * id
+    */
+    private String id;
+
+    /**
+    * 无净值基金名称
+    */
+    private String fundName;
+
+    /**
+    * 募集期开始结束时间
+    */
+    private String startEndDate;
+
+    /**
+    * 创建时间
+    */
+    private Date createTime;
+
+    /**
+    * 修改时间
+    */
+    private Date updateTime;
+
+    /**
+    * 0正常 1删除
+    */
+    private Integer deleteTag;
+
+    /**
+    * 理财师id
+    */
+    private String ifaId;
+
+    /**
+    * 机构id
+    */
+    private String orgId;
+
+    /**
+    * 产品概要
+    */
+    private String summary;
+
+    /**
+    * 产品详情
+    */
+    private String detail;
+
+    /**
+    * 基金附件pdf
+    */
+    private String fundFile;
+
+    /**
+    * 基金图片
+    */
+    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

+package com.tanpu.fund.entity.generator;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class IfaImportedNonavFundExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public IfaImportedNonavFundExample() {
+        oredCriteria = new ArrayList<>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundNameIsNull() {
+            addCriterion("fund_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundNameIsNotNull() {
+            addCriterion("fund_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundNameEqualTo(String value) {
+            addCriterion("fund_name =", value, "fundName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundNameNotEqualTo(String value) {
+            addCriterion("fund_name <>", value, "fundName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundNameGreaterThan(String value) {
+            addCriterion("fund_name >", value, "fundName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundNameGreaterThanOrEqualTo(String value) {
+            addCriterion("fund_name >=", value, "fundName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundNameLessThan(String value) {
+            addCriterion("fund_name <", value, "fundName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundNameLessThanOrEqualTo(String value) {
+            addCriterion("fund_name <=", value, "fundName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundNameLike(String value) {
+            addCriterion("fund_name like", value, "fundName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundNameNotLike(String value) {
+            addCriterion("fund_name not like", value, "fundName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundNameIn(List<String> values) {
+            addCriterion("fund_name in", values, "fundName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundNameNotIn(List<String> values) {
+            addCriterion("fund_name not in", values, "fundName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundNameBetween(String value1, String value2) {
+            addCriterion("fund_name between", value1, value2, "fundName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFundNameNotBetween(String value1, String value2) {
+            addCriterion("fund_name not between", value1, value2, "fundName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartEndDateIsNull() {
+            addCriterion("start_end_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartEndDateIsNotNull() {
+            addCriterion("start_end_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartEndDateEqualTo(String value) {
+            addCriterion("start_end_date =", value, "startEndDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartEndDateNotEqualTo(String value) {
+            addCriterion("start_end_date <>", value, "startEndDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartEndDateGreaterThan(String value) {
+            addCriterion("start_end_date >", value, "startEndDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartEndDateGreaterThanOrEqualTo(String value) {
+            addCriterion("start_end_date >=", value, "startEndDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartEndDateLessThan(String value) {
+            addCriterion("start_end_date <", value, "startEndDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartEndDateLessThanOrEqualTo(String value) {
+            addCriterion("start_end_date <=", value, "startEndDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartEndDateLike(String value) {
+            addCriterion("start_end_date like", value, "startEndDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartEndDateNotLike(String value) {
+            addCriterion("start_end_date not like", value, "startEndDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartEndDateIn(List<String> values) {
+            addCriterion("start_end_date in", values, "startEndDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartEndDateNotIn(List<String> values) {
+            addCriterion("start_end_date not in", values, "startEndDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartEndDateBetween(String value1, String value2) {
+            addCriterion("start_end_date between", value1, value2, "startEndDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStartEndDateNotBetween(String value1, String value2) {
+            addCriterion("start_end_date not between", value1, value2, "startEndDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTagIsNull() {
+            addCriterion("delete_tag is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTagIsNotNull() {
+            addCriterion("delete_tag is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTagEqualTo(Integer value) {
+            addCriterion("delete_tag =", value, "deleteTag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTagNotEqualTo(Integer value) {
+            addCriterion("delete_tag <>", value, "deleteTag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTagGreaterThan(Integer value) {
+            addCriterion("delete_tag >", value, "deleteTag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTagGreaterThanOrEqualTo(Integer value) {
+            addCriterion("delete_tag >=", value, "deleteTag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTagLessThan(Integer value) {
+            addCriterion("delete_tag <", value, "deleteTag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTagLessThanOrEqualTo(Integer value) {
+            addCriterion("delete_tag <=", value, "deleteTag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTagIn(List<Integer> values) {
+            addCriterion("delete_tag in", values, "deleteTag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTagNotIn(List<Integer> values) {
+            addCriterion("delete_tag not in", values, "deleteTag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTagBetween(Integer value1, Integer value2) {
+            addCriterion("delete_tag between", value1, value2, "deleteTag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeleteTagNotBetween(Integer value1, Integer value2) {
+            addCriterion("delete_tag not between", value1, value2, "deleteTag");
+            return (Criteria) this;
+        }
+
+        public Criteria andIfaIdIsNull() {
+            addCriterion("ifa_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIfaIdIsNotNull() {
+            addCriterion("ifa_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIfaIdEqualTo(String value) {
+            addCriterion("ifa_id =", value, "ifaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIfaIdNotEqualTo(String value) {
+            addCriterion("ifa_id <>", value, "ifaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIfaIdGreaterThan(String value) {
+            addCriterion("ifa_id >", value, "ifaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIfaIdGreaterThanOrEqualTo(String value) {
+            addCriterion("ifa_id >=", value, "ifaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIfaIdLessThan(String value) {
+            addCriterion("ifa_id <", value, "ifaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIfaIdLessThanOrEqualTo(String value) {
+            addCriterion("ifa_id <=", value, "ifaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIfaIdLike(String value) {
+            addCriterion("ifa_id like", value, "ifaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIfaIdNotLike(String value) {
+            addCriterion("ifa_id not like", value, "ifaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIfaIdIn(List<String> values) {
+            addCriterion("ifa_id in", values, "ifaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIfaIdNotIn(List<String> values) {
+            addCriterion("ifa_id not in", values, "ifaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIfaIdBetween(String value1, String value2) {
+            addCriterion("ifa_id between", value1, value2, "ifaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIfaIdNotBetween(String value1, String value2) {
+            addCriterion("ifa_id not between", value1, value2, "ifaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNull() {
+            addCriterion("org_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNotNull() {
+            addCriterion("org_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdEqualTo(String value) {
+            addCriterion("org_id =", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotEqualTo(String value) {
+            addCriterion("org_id <>", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThan(String value) {
+            addCriterion("org_id >", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThanOrEqualTo(String value) {
+            addCriterion("org_id >=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThan(String value) {
+            addCriterion("org_id <", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThanOrEqualTo(String value) {
+            addCriterion("org_id <=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLike(String value) {
+            addCriterion("org_id like", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotLike(String value) {
+            addCriterion("org_id not like", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIn(List<String> values) {
+            addCriterion("org_id in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotIn(List<String> values) {
+            addCriterion("org_id not in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdBetween(String value1, String value2) {
+            addCriterion("org_id between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotBetween(String value1, String value2) {
+            addCriterion("org_id not between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file

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

+package com.tanpu.fund.mapper.generator;
+
+import com.tanpu.fund.entity.generator.IfaImportedNonavFund;
+import com.tanpu.fund.entity.generator.IfaImportedNonavFundExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@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);
+
+    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

@@ -87,4 +87,6 @@ public interface ProductService {
     Long getFundRankCountInfo(FundRankReq req);
 
     List<Type> getFundLikeShortName(String productName, Pageable page);
+
+    List<FundSameResp> getNoNetfund(String fundId);
 }

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

@@ -72,6 +72,9 @@ public class ProductServiceImpl implements ProductService, Constant {
     @Resource
     private FundInfoMapper fundInfoMapper;
 
+    @Resource
+    private IfaImportedNonavFundMapper ifaImportedNonavFundMapper;
+
     @Resource
     private FundPerformanceMapper fundPerformanceMapper;
 
@@ -1671,34 +1674,38 @@ public class ProductServiceImpl implements ProductService, Constant {
         example.createCriteria().andIfaIdEqualTo(UserInfoThreadLocalHolder.getserInfo().getId())
                 .andIdNotEqualTo(fundId)
                 .andDeleteTagEqualTo(BizEnums.DeleteTag.tag_init);
+        PageMethod.startPage(1, 10);
         List<IfaImportedFundInfo> importedFundInfoList = ifaImportedFundInfoMapper.selectByExample(example);
 
-        List<String> fundIdList = importedFundInfoList.stream().map(IfaImportedFundInfo::getId).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(importedFundInfoList)) {
+            List<String> fundIdList = importedFundInfoList.stream().map(IfaImportedFundInfo::getId).collect(Collectors.toList());
 
-        IfaImportedFundCountExample countExample = new IfaImportedFundCountExample();
-        countExample.createCriteria().andFundIdIn(fundIdList).andDeleteTagEqualTo(BizEnums.DeleteTag.tag_init);
-        List<IfaImportedFundCount> importedFundCountList = ifaImportedFundCountMapper.selectByExample(countExample);
+            IfaImportedFundCountExample countExample = new IfaImportedFundCountExample();
+            countExample.createCriteria().andFundIdIn(fundIdList).andDeleteTagEqualTo(BizEnums.DeleteTag.tag_init);
+            List<IfaImportedFundCount> importedFundCountList = ifaImportedFundCountMapper.selectByExample(countExample);
 
-        Map<String, IfaImportedFundCount> fundCountMap;
-        if (CollectionUtils.isNotEmpty(importedFundCountList)) {
-            fundCountMap = importedFundCountList.stream().collect(Collectors.toMap(IfaImportedFundCount::getFundId, c -> c));
-        } else {
-            fundCountMap = null;
-        }
+            Map<String, IfaImportedFundCount> fundCountMap;
+            if (CollectionUtils.isNotEmpty(importedFundCountList)) {
+                fundCountMap = importedFundCountList.stream().collect(Collectors.toMap(IfaImportedFundCount::getFundId, c -> c));
+            } else {
+                fundCountMap = null;
+            }
 
-        List<String> checkFundIdList = feignClientForDiagnose.getFundCollectInfo(fundIdList).getAttributes();
+            List<String> checkFundIdList = feignClientForDiagnose.getFundCollectInfo(fundIdList).getAttributes();
 
-        importedFundInfoList.forEach(item -> {
-            FundSameResp p = FundSameResp.builder()
-                    .fundId(item.getId())
-                    .fundName(item.getFundName())
-                    .isCheck(CollectionUtils.isNotEmpty(checkFundIdList) ? (checkFundIdList.contains(item.getId()) ? 1 : 0) : 0)
-                    .build();
+            return importedFundInfoList.stream().map(item -> {
+                FundSameResp p = FundSameResp.builder()
+                        .fundId(item.getId())
+                        .fundName(item.getFundName())
+                        .isCheck(CollectionUtils.isNotEmpty(checkFundIdList) ? (checkFundIdList.contains(item.getId()) ? 1 : 0) : 0)
+                        .build();
 
-            if (fundCountMap != null && fundCountMap.containsKey(item.getId())) {
-                p.setRet1y(BigDecimalUtil.toString(fundCountMap.get(item.getId()).getRet1y(), 2));
-            }
-        });
+                if (fundCountMap != null && fundCountMap.containsKey(item.getId())) {
+                    p.setRet1y(BigDecimalUtil.toString(fundCountMap.get(item.getId()).getRet1y(), 2));
+                }
+                return p;
+            }).collect(Collectors.toList());
+        }
 
         return new ArrayList<>(0);
     }
@@ -2402,4 +2409,26 @@ public class ProductServiceImpl implements ProductService, Constant {
         return this.fundInfoCustomMapper.getFundInfoLikeName("%" + productName + "%");
     }
 
+    @Override
+    public List<FundSameResp> getNoNetfund(String fundId) {
+        IfaImportedNonavFundExample example = new IfaImportedNonavFundExample();
+        example.createCriteria().andIfaIdEqualTo(UserInfoThreadLocalHolder.getserInfo().getId())
+                .andIdNotEqualTo(fundId)
+                .andDeleteTagEqualTo(BizEnums.DeleteTag.tag_init);
+        PageMethod.startPage(1, 10);
+        List<IfaImportedNonavFund> importedFundInfoList = ifaImportedNonavFundMapper.selectByExample(example);
+
+        if (CollectionUtils.isNotEmpty(importedFundInfoList)) {
+            List<String> fundIdList = importedFundInfoList.stream().map(IfaImportedNonavFund::getId).collect(Collectors.toList());
+            List<String> checkFundIdList = feignClientForDiagnose.getFundCollectInfo(fundIdList).getAttributes();
+
+            return importedFundInfoList.stream().map(item -> FundSameResp.builder()
+                        .fundId(item.getId())
+                        .fundName(item.getFundName())
+                        .isCheck(CollectionUtils.isNotEmpty(checkFundIdList) ? (checkFundIdList.contains(item.getId()) ? 1 : 0) : 0)
+                        .build()).collect(Collectors.toList());
+        }
+
+        return new ArrayList<>(0);
+    }
 }

src/main/resources/application-dev.properties

@@ -94,6 +94,10 @@ tanpu.oss.ali.region-id = cn-shanghai
 tanpu.oss.ali.endpoint = https://oss-${tanpu.oss.ali.region-id}.aliyuncs.com
 tanpu.oss.ali.bucket-domain = https://${tanpu.oss.ali.bucket-name}.oss-${tanpu.oss.ali.region-id}.aliyuncs.com
 tanpu.oss.ali.oss-path = /upload
+tanpu.oss.ali.access-key-id=LTAIAKEzVydP0Q9P
+tanpu.oss.ali.secret-access-key=59V9ke9txaIFzWxHFKTb1eoOOpmKpJ
+tanpu.oss.ali.project-name=faTools-sit
+tanpu.oss.ali.doc-convert-output-path=/docConvertOutput
 
 tanpu.userno.startstep = 10000000
 

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<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-->
+    <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="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>
+  <sql id="Example_Where_Clause">
+    <!--@mbg.generated-->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--@mbg.generated-->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, fund_name, start_end_date, create_time, update_time, delete_tag, ifa_id, org_id
+  </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
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_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="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+    <!--@mbg.generated-->
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from tamp_fund.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
+    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
+    <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
+      )
+    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}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.tanpu.fund.entity.generator.IfaImportedNonavFund">
+    <!--@mbg.generated-->
+    insert into tamp_fund.ifa_imported_nonav_fund
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="fundName != null">
+        fund_name,
+      </if>
+      <if test="startEndDate != null">
+        start_end_date,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="deleteTag != null">
+        delete_tag,
+      </if>
+      <if test="ifaId != null">
+        ifa_id,
+      </if>
+      <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>
+      <if test="fundPng != null">
+        fund_png,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="fundName != null">
+        #{fundName,jdbcType=VARCHAR},
+      </if>
+      <if test="startEndDate != null">
+        #{startEndDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleteTag != null">
+        #{deleteTag,jdbcType=INTEGER},
+      </if>
+      <if test="ifaId != null">
+        #{ifaId,jdbcType=VARCHAR},
+      </if>
+      <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>
+      <if test="fundPng != null">
+        #{fundPng,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </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
+    <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
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fundName != null">
+        fund_name = #{record.fundName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.startEndDate != null">
+        start_end_date = #{record.startEndDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.deleteTag != null">
+        delete_tag = #{record.deleteTag,jdbcType=INTEGER},
+      </if>
+      <if test="record.ifaId != null">
+        ifa_id = #{record.ifaId,jdbcType=VARCHAR},
+      </if>
+      <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>
+      <if test="record.fundPng != null">
+        fund_png = #{record.fundPng,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" 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},
+      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
+    <set>
+      <if test="fundName != null">
+        fund_name = #{fundName,jdbcType=VARCHAR},
+      </if>
+      <if test="startEndDate != null">
+        start_end_date = #{startEndDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleteTag != null">
+        delete_tag = #{deleteTag,jdbcType=INTEGER},
+      </if>
+      <if test="ifaId != null">
+        ifa_id = #{ifaId,jdbcType=VARCHAR},
+      </if>
+      <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>
+      <if test="fundPng != null">
+        fund_png = #{fundPng,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" 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},
+      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
+    <trim prefix="set" suffixOverrides=",">
+      <trim prefix="fund_name = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.fundName,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="start_end_date = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.startEndDate,jdbcType=VARCHAR}
+        </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}
+        </foreach>
+      </trim>
+      <trim prefix="update_time = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+      </trim>
+      <trim prefix="delete_tag = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.deleteTag,jdbcType=INTEGER}
+        </foreach>
+      </trim>
+      <trim prefix="ifa_id = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.ifaId,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="org_id = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          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}
+        </foreach>
+      </trim>
+      <trim prefix="fund_png = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=VARCHAR} then #{item.fundPng,jdbcType=LONGVARCHAR}
+        </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 tamp_fund.ifa_imported_nonav_fund
+    <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="start_end_date = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.startEndDate != null">
+            when id = #{item.id,jdbcType=VARCHAR} then #{item.startEndDate,jdbcType=VARCHAR}
+          </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="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="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="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="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>
+        </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">
+            when id = #{item.id,jdbcType=VARCHAR} then #{item.fundFile,jdbcType=LONGVARCHAR}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="fund_png = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.fundPng != null">
+            when id = #{item.id,jdbcType=VARCHAR} then #{item.fundPng,jdbcType=LONGVARCHAR}
+          </if>
+        </foreach>
+      </trim>
+    </trim>
+    where id in
+    <foreach close=")" collection="list" item="item" open="(" separator=", ">
+      #{item.id,jdbcType=VARCHAR}
+    </foreach>
+  </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)
+    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}
+        )
+    </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)
+    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}
+      )
+    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}, 
+    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
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="fundName != null">
+        fund_name,
+      </if>
+      <if test="startEndDate != null">
+        start_end_date,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="deleteTag != null">
+        delete_tag,
+      </if>
+      <if test="ifaId != null">
+        ifa_id,
+      </if>
+      <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>
+      <if test="fundPng != null">
+        fund_png,
+      </if>
+    </trim>
+    values
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="fundName != null">
+        #{fundName,jdbcType=VARCHAR},
+      </if>
+      <if test="startEndDate != null">
+        #{startEndDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleteTag != null">
+        #{deleteTag,jdbcType=INTEGER},
+      </if>
+      <if test="ifaId != null">
+        #{ifaId,jdbcType=VARCHAR},
+      </if>
+      <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>
+      <if test="fundPng != null">
+        #{fundPng,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+    on duplicate key update 
+    <trim suffixOverrides=",">
+      <if test="id != null">
+        id = #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="fundName != null">
+        fund_name = #{fundName,jdbcType=VARCHAR},
+      </if>
+      <if test="startEndDate != null">
+        start_end_date = #{startEndDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleteTag != null">
+        delete_tag = #{deleteTag,jdbcType=INTEGER},
+      </if>
+      <if test="ifaId != null">
+        ifa_id = #{ifaId,jdbcType=VARCHAR},
+      </if>
+      <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>
+      <if test="fundPng != null">
+        fund_png = #{fundPng,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+</mapper>
\ No newline at end of file