Skip to content

T
tamp_fund
Commit f0dd9842 authored by 王亚雷's avatar 王亚雷
Browse files
Options

删除字段preNav

parent 1dd8546d
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 111 deletions
src/main/java/com/tanpu/fund/entity/generator/FundNav.java
View file @ f0dd9842
package com.tanpu.fund.entity.generator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
import java.util.Date;
import lombok.AllArgsConstructor;
......@@ -7,82 +9,78 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author: zhoupeng
* <p>
* =========================================
* =========================================
* ======== ========
* ======= ========== ======= =======
* ====== ===== == ==== ======
* ===== ===== == === =====
* ===== ===== == === =====
* ===== ===== == === =====
* ====== ========== == ======
* ======= =======
* =========================================
* =========================================
* <p>
* @email: zhoupeng_08@163.com
*/
/**
* 基金净值
*/
@ApiModel(value = "基金净值")
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class FundNav {
@ApiModelProperty(value = "")
private String id;
/**
* 基金id，'HF'开头(后加36进制编码格式,不足8位长度左补零） 例：HF00000001
*/
@ApiModelProperty(value = "基金id，'HF'开头(后加36进制编码格式,不足8位长度左补零） 例：HF00000001")
private String fundId;
/**
* 净值日期
*/
@ApiModelProperty(value = "净值日期")
private Date priceDate;
/**
* 单位净值
*/
@ApiModelProperty(value = "单位净值")
private BigDecimal nav;
/**
* 考虑分红再投资的单位累计净值
*/
@ApiModelProperty(value = "考虑分红再投资的单位累计净值")
private BigDecimal cumulativeNav;
/**
* 分红不投资的单位累计净值
*/
@ApiModelProperty(value = "分红不投资的单位累计净值")
private BigDecimal cumulativeNavWithdrawal;
/**
* 净值创新高或新低标志；1-创历史新高；2-创历史新低；3-既没有创历史新高也没有创历史新低;-1-其他
*/
@ApiModelProperty(value = "净值创新高或新低标志；1-创历史新高；2-创历史新低；3-既没有创历史新高也没有创历史新低;-1-其他")
private Integer ishighOrLow;
/**
* 距离历史新高的距离，（历史最高累计净值-最新累计净值）*100%/最新累计净值
*/
@ApiModelProperty(value = "距离历史新高的距离，（历史最高累计净值-最新累计净值）*100%/最新累计净值")
private BigDecimal tohighNavRatio;
@ApiModelProperty(value = "")
private String createBy;
@ApiModelProperty(value = "")
private Date createTime;
@ApiModelProperty(value = "")
private String updateBy;
@ApiModelProperty(value = "")
private Date updateTime;
@ApiModelProperty(value = "")
private Integer deleteTag;
/**
* 前一日单位净值
* 机构ID
*/
private BigDecimal preNav;
@ApiModelProperty(value = "机构ID")
private String orgId;
}
\ No newline at end of file
src/main/java/com/tanpu/fund/entity/generator/FundNavExample.java
View file @ f0dd9842
......@@ -6,24 +6,6 @@ import java.util.Date;
import java.util.Iterator;
import java.util.List;
/**
* @author: zhoupeng
* <p>
* =========================================
* =========================================
* ======== ========
* ======= ========== ======= =======
* ====== ===== == ==== ======
* ===== ===== == === =====
* ===== ===== == === =====
* ===== ===== == === =====
* ====== ========== == ======
* ======= =======
* =========================================
* =========================================
* <p>
* @email: zhoupeng_08@163.com
*/
public class FundNavExample {
protected String orderByClause;
......@@ -971,63 +953,73 @@ public class FundNavExample {
return (Criteria) this;
}
public Criteria andPreNavIsNull() {
addCriterion("pre_nav is null");
public Criteria andOrgIdIsNull() {
addCriterion("org_id is null");
return (Criteria) this;
}
public Criteria andPreNavIsNotNull() {
addCriterion("pre_nav is not null");
public Criteria andOrgIdIsNotNull() {
addCriterion("org_id is not null");
return (Criteria) this;
}
public Criteria andPreNavEqualTo(BigDecimal value) {
addCriterion("pre_nav =", value, "preNav");
public Criteria andOrgIdEqualTo(String value) {
addCriterion("org_id =", value, "orgId");
return (Criteria) this;
}
public Criteria andPreNavNotEqualTo(BigDecimal value) {
addCriterion("pre_nav <>", value, "preNav");
public Criteria andOrgIdNotEqualTo(String value) {
addCriterion("org_id <>", value, "orgId");
return (Criteria) this;
}
public Criteria andPreNavGreaterThan(BigDecimal value) {
addCriterion("pre_nav >", value, "preNav");
public Criteria andOrgIdGreaterThan(String value) {
addCriterion("org_id >", value, "orgId");
return (Criteria) this;
}
public Criteria andPreNavGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("pre_nav >=", value, "preNav");
public Criteria andOrgIdGreaterThanOrEqualTo(String value) {
addCriterion("org_id >=", value, "orgId");
return (Criteria) this;
}
public Criteria andPreNavLessThan(BigDecimal value) {
addCriterion("pre_nav <", value, "preNav");
public Criteria andOrgIdLessThan(String value) {
addCriterion("org_id <", value, "orgId");
return (Criteria) this;
}
public Criteria andPreNavLessThanOrEqualTo(BigDecimal value) {
addCriterion("pre_nav <=", value, "preNav");
public Criteria andOrgIdLessThanOrEqualTo(String value) {
addCriterion("org_id <=", value, "orgId");
return (Criteria) this;
}
public Criteria andPreNavIn(List<BigDecimal> values) {
addCriterion("pre_nav in", values, "preNav");
public Criteria andOrgIdLike(String value) {
addCriterion("org_id like", value, "orgId");
return (Criteria) this;
}
public Criteria andPreNavNotIn(List<BigDecimal> values) {
addCriterion("pre_nav not in", values, "preNav");
public Criteria andOrgIdNotLike(String value) {
addCriterion("org_id not like", value, "orgId");
return (Criteria) this;
}
public Criteria andPreNavBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("pre_nav between", value1, value2, "preNav");
public Criteria andOrgIdIn(List<String> values) {
addCriterion("org_id in", values, "orgId");
return (Criteria) this;
}
public Criteria andPreNavNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("pre_nav not between", value1, value2, "preNav");
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;
}
}
......
src/main/java/com/tanpu/fund/mapper/generator/FundNavMapper.java
View file @ f0dd9842
......@@ -6,50 +6,68 @@ 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 FundNavMapper {
long countByExample(FundNavExample example);
int deleteByExample(FundNavExample 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(FundNav record);
int insertOrUpdate(FundNav record);
int insertOrUpdateSelective(FundNav record);
/**
* insert record to table selective
*
* @param record the record
* @return insert count
*/
int insertSelective(FundNav record);
List<FundNav> selectByExample(FundNavExample example);
/**
* select by primary key
*
* @param id primary key
* @return object by primary key
*/
FundNav selectByPrimaryKey(String id);
int updateByExampleSelective(@Param("record") FundNav record, @Param("example") FundNavExample example);
int updateByExample(@Param("record") FundNav record, @Param("example") FundNavExample example);
/**
* update record selective
*
* @param record the updated record
* @return update count
*/
int updateByPrimaryKeySelective(FundNav record);
/**
* update record
*
* @param record the updated record
* @return update count
*/
int updateByPrimaryKey(FundNav record);
int updateBatch(List<FundNav> list);
......
src/main/resources/mybatis/generator/FundNavMapper.xml
View file @ f0dd9842
......@@ -17,7 +17,7 @@
<result column="update_by" jdbcType="VARCHAR" property="updateBy" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="delete_tag" jdbcType="INTEGER" property="deleteTag" />
<result column="pre_nav" jdbcType="DECIMAL" property="preNav" />
<result column="org_id" jdbcType="VARCHAR" property="orgId" />
</resultMap>
<sql id="Example_Where_Clause">
<!--@mbg.generated-->
......@@ -82,7 +82,7 @@
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, fund_id, price_date, nav, cumulative_nav, cumulative_nav_withdrawal, ishigh_or_low,
tohigh_nav_ratio, create_by, create_time, update_by, update_time, delete_tag, pre_nav
tohigh_nav_ratio, create_by, create_time, update_by, update_time, delete_tag, org_id
</sql>
<select id="selectByExample" parameterType="com.tanpu.fund.entity.generator.FundNavExample" resultMap="BaseResultMap">
<!--@mbg.generated-->
......@@ -124,12 +124,12 @@
nav, cumulative_nav, cumulative_nav_withdrawal,
ishigh_or_low, tohigh_nav_ratio, create_by,
create_time, update_by, update_time,
delete_tag, pre_nav)
delete_tag, org_id)
values (#{id,jdbcType=VARCHAR}, #{fundId,jdbcType=VARCHAR}, #{priceDate,jdbcType=DATE},
#{nav,jdbcType=DECIMAL}, #{cumulativeNav,jdbcType=DECIMAL}, #{cumulativeNavWithdrawal,jdbcType=DECIMAL},
#{ishighOrLow,jdbcType=INTEGER}, #{tohighNavRatio,jdbcType=DECIMAL}, #{createBy,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
#{deleteTag,jdbcType=INTEGER}, #{preNav,jdbcType=DECIMAL})
#{deleteTag,jdbcType=INTEGER}, #{orgId,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.tanpu.fund.entity.generator.FundNav">
<!--@mbg.generated-->
......@@ -174,8 +174,8 @@
<if test="deleteTag != null">
delete_tag,
</if>
<if test="preNav != null">
pre_nav,
<if test="orgId != null">
org_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
......@@ -218,8 +218,8 @@
<if test="deleteTag != null">
#{deleteTag,jdbcType=INTEGER},
</if>
<if test="preNav != null">
#{preNav,jdbcType=DECIMAL},
<if test="orgId != null">
#{orgId,jdbcType=VARCHAR},
</if>
</trim>
</insert>
......@@ -273,8 +273,8 @@
<if test="record.deleteTag != null">
delete_tag = #{record.deleteTag,jdbcType=INTEGER},
</if>
<if test="record.preNav != null">
pre_nav = #{record.preNav,jdbcType=DECIMAL},
<if test="record.orgId != null">
org_id = #{record.orgId,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
......@@ -297,7 +297,7 @@
update_by = #{record.updateBy,jdbcType=VARCHAR},
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
delete_tag = #{record.deleteTag,jdbcType=INTEGER},
pre_nav = #{record.preNav,jdbcType=DECIMAL}
org_id = #{record.orgId,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -342,8 +342,8 @@
<if test="deleteTag != null">
delete_tag = #{deleteTag,jdbcType=INTEGER},
</if>
<if test="preNav != null">
pre_nav = #{preNav,jdbcType=DECIMAL},
<if test="orgId != null">
org_id = #{orgId,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=VARCHAR}
......@@ -363,7 +363,7 @@
update_by = #{updateBy,jdbcType=VARCHAR},
update_time = #{updateTime,jdbcType=TIMESTAMP},
delete_tag = #{deleteTag,jdbcType=INTEGER},
pre_nav = #{preNav,jdbcType=DECIMAL}
org_id = #{orgId,jdbcType=VARCHAR}
where id = #{id,jdbcType=VARCHAR}
</update>
<update id="updateBatch" parameterType="java.util.List">
......@@ -430,9 +430,9 @@
when id = #{item.id,jdbcType=VARCHAR} then #{item.deleteTag,jdbcType=INTEGER}
</foreach>
</trim>
<trim prefix="pre_nav = case" suffix="end,">
<trim prefix="org_id = case" suffix="end,">
<foreach collection="list" index="index" item="item">
when id = #{item.id,jdbcType=VARCHAR} then #{item.preNav,jdbcType=DECIMAL}
when id = #{item.id,jdbcType=VARCHAR} then #{item.orgId,jdbcType=VARCHAR}
</foreach>
</trim>
</trim>
......@@ -529,10 +529,10 @@
</if>
</foreach>
</trim>
<trim prefix="pre_nav = case" suffix="end,">
<trim prefix="org_id = case" suffix="end,">
<foreach collection="list" index="index" item="item">
<if test="item.preNav != null">
when id = #{item.id,jdbcType=VARCHAR} then #{item.preNav,jdbcType=DECIMAL}
<if test="item.orgId != null">
when id = #{item.id,jdbcType=VARCHAR} then #{item.orgId,jdbcType=VARCHAR}
</if>
</foreach>
</trim>
......@@ -546,7 +546,7 @@
<!--@mbg.generated-->
insert into fund_nav
(id, fund_id, price_date, nav, cumulative_nav, cumulative_nav_withdrawal, ishigh_or_low,
tohigh_nav_ratio, create_by, create_time, update_by, update_time, delete_tag, pre_nav
tohigh_nav_ratio, create_by, create_time, update_by, update_time, delete_tag, org_id
)
values
<foreach collection="list" item="item" separator=",">
......@@ -554,7 +554,7 @@
#{item.nav,jdbcType=DECIMAL}, #{item.cumulativeNav,jdbcType=DECIMAL}, #{item.cumulativeNavWithdrawal,jdbcType=DECIMAL},
#{item.ishighOrLow,jdbcType=INTEGER}, #{item.tohighNavRatio,jdbcType=DECIMAL},
#{item.createBy,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateBy,jdbcType=VARCHAR},
#{item.updateTime,jdbcType=TIMESTAMP}, #{item.deleteTag,jdbcType=INTEGER}, #{item.preNav,jdbcType=DECIMAL}
#{item.updateTime,jdbcType=TIMESTAMP}, #{item.deleteTag,jdbcType=INTEGER}, #{item.orgId,jdbcType=VARCHAR}
)
</foreach>
</insert>
......@@ -562,14 +562,14 @@
<!--@mbg.generated-->
insert into fund_nav
(id, fund_id, price_date, nav, cumulative_nav, cumulative_nav_withdrawal, ishigh_or_low,
tohigh_nav_ratio, create_by, create_time, update_by, update_time, delete_tag, pre_nav
tohigh_nav_ratio, create_by, create_time, update_by, update_time, delete_tag, org_id
)
values
(#{id,jdbcType=VARCHAR}, #{fundId,jdbcType=VARCHAR}, #{priceDate,jdbcType=DATE},
#{nav,jdbcType=DECIMAL}, #{cumulativeNav,jdbcType=DECIMAL}, #{cumulativeNavWithdrawal,jdbcType=DECIMAL},
#{ishighOrLow,jdbcType=INTEGER}, #{tohighNavRatio,jdbcType=DECIMAL}, #{createBy,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
#{deleteTag,jdbcType=INTEGER}, #{preNav,jdbcType=DECIMAL})
#{deleteTag,jdbcType=INTEGER}, #{orgId,jdbcType=VARCHAR})
on duplicate key update
id = #{id,jdbcType=VARCHAR},
fund_id = #{fundId,jdbcType=VARCHAR},
......@@ -584,7 +584,7 @@
update_by = #{updateBy,jdbcType=VARCHAR},
update_time = #{updateTime,jdbcType=TIMESTAMP},
delete_tag = #{deleteTag,jdbcType=INTEGER},
pre_nav = #{preNav,jdbcType=DECIMAL}
org_id = #{orgId,jdbcType=VARCHAR}
</insert>
<insert id="insertOrUpdateSelective" parameterType="com.tanpu.fund.entity.generator.FundNav">
<!--@mbg.generated-->
......@@ -629,8 +629,8 @@
<if test="deleteTag != null">
delete_tag,
</if>
<if test="preNav != null">
pre_nav,
<if test="orgId != null">
org_id,
</if>
</trim>
values
......@@ -674,8 +674,8 @@
<if test="deleteTag != null">
#{deleteTag,jdbcType=INTEGER},
</if>
<if test="preNav != null">
#{preNav,jdbcType=DECIMAL},
<if test="orgId != null">
#{orgId,jdbcType=VARCHAR},
</if>
</trim>
on duplicate key update
......@@ -719,8 +719,8 @@
<if test="deleteTag != null">
delete_tag = #{deleteTag,jdbcType=INTEGER},
</if>
<if test="preNav != null">
pre_nav = #{preNav,jdbcType=DECIMAL},
<if test="orgId != null">
org_id = #{orgId,jdbcType=VARCHAR},
</if>
</trim>
</insert>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment