Skip to content

T
tamp_fund
Commit 42c1589a authored by 张亚辉's avatar 张亚辉
Browse files
Options

merge

parents 5525b8fd 16577bf7
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 35 deletions
src/main/java/com/tanpu/fund/entity/generator/IfaImportedNonavFund.java
View file @ 42c1589a
......@@ -88,4 +88,4 @@ public class IfaImportedNonavFund {
* 基金图片
*/
private String fundPng;
}
\ No newline at end of file
}
src/main/java/com/tanpu/fund/entity/generator/IfaImportedNonavFundExample.java
View file @ 42c1589a
......@@ -1026,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
View file @ 42c1589a
......@@ -57,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/impl/ProductServiceImpl.java
View file @ 42c1589a
......@@ -841,7 +841,7 @@ public class ProductServiceImpl implements ProductService, Constant {
new RiskRatingVO("最近五年", multiply100(fundCount.getMaxdrawdown5y()),
multiply100(fundCount.getStddev5y()), BigDecimalUtil.toString(fundCount.getSharperatio5y()), multiply100(fundCount.getRet5yA())),
new RiskRatingVO("成立以来", multiply100(fundCount.getMaxdrawdownIncep()),
multiply100(fundCount.getStddevIncep()), BigDecimalUtil.toString(fundCount.getSharperatioIncep()), multiply100(fundCount.getRetIncepA())));
multiply100(fundCount.getStddevIncep()), BigDecimalUtil.toString(fundCount.getSharperatioIncep(), 2), multiply100(fundCount.getRetIncepA())));
}
@Override
......@@ -1553,7 +1553,7 @@ public class ProductServiceImpl implements ProductService, Constant {
new RiskRatingVO("最近五年", multiply100(fundCount.getMaxdrawdown5y()),
multiply100(fundCount.getStddev5y()), multiply100(fundCount.getSharperatio5y()), multiply100(fundCount.getRet5yA())),
new RiskRatingVO("成立以来", multiply100(fundCount.getMaxdrawdownIncep()),
multiply100(fundCount.getStddevIncep()), multiply100(fundCount.getSharperatioIncep()), multiply100(fundCount.getRetIncepA())));
multiply100(fundCount.getStddevIncep()), BigDecimalUtil.toString(fundCount.getSharperatioIncep(), 2), multiply100(fundCount.getRetIncepA())));
}
@Override
......
src/main/resources/mybatis/generator/IfaImportedNonavFundMapper.xml
View file @ 42c1589a
......@@ -79,7 +79,7 @@
</sql>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, fund_name, start_end_date, summary, detail, create_time, update_time, delete_tag,
id, fund_name, start_end_date, summary, detail, create_time, update_time, delete_tag,
ifa_id, org_id, fund_file, fund_png
</sql>
<select id="selectByExample" parameterType="com.tanpu.fund.entity.generator.IfaImportedNonavFundExample" resultMap="BaseResultMap">
......@@ -99,7 +99,7 @@
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
select
<include refid="Base_Column_List" />
from ifa_imported_nonav_fund
where id = #{id,jdbcType=VARCHAR}
......@@ -118,14 +118,14 @@
</delete>
<insert id="insert" parameterType="com.tanpu.fund.entity.generator.IfaImportedNonavFund">
<!--@mbg.generated-->
insert into ifa_imported_nonav_fund (id, fund_name, start_end_date,
summary, detail, create_time,
update_time, delete_tag, ifa_id,
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},
#{summary,jdbcType=LONGVARCHAR}, #{detail,jdbcType=LONGVARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{deleteTag,jdbcType=INTEGER}, #{ifaId,jdbcType=VARCHAR},
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>
......@@ -491,13 +491,13 @@
<insert id="batchInsert" parameterType="map">
<!--@mbg.generated-->
insert into ifa_imported_nonav_fund
(id, fund_name, start_end_date, summary, detail, create_time, update_time, delete_tag,
(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.summary,jdbcType=LONGVARCHAR}, #{item.detail,jdbcType=LONGVARCHAR}, #{item.createTime,jdbcType=TIMESTAMP},
#{item.updateTime,jdbcType=TIMESTAMP}, #{item.deleteTag,jdbcType=INTEGER}, #{item.ifaId,jdbcType=VARCHAR},
(#{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>
......@@ -505,26 +505,26 @@
<insert id="insertOrUpdate" parameterType="com.tanpu.fund.entity.generator.IfaImportedNonavFund">
<!--@mbg.generated-->
insert into ifa_imported_nonav_fund
(id, fund_name, start_end_date, summary, detail, create_time, update_time, delete_tag,
(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},
#{summary,jdbcType=LONGVARCHAR}, #{detail,jdbcType=LONGVARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{deleteTag,jdbcType=INTEGER}, #{ifaId,jdbcType=VARCHAR},
(#{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},
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},
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">
......@@ -607,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},
......@@ -647,4 +647,4 @@
</if>
</trim>
</insert>
</mapper>
\ No newline at end of file
</mapper>
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