Commit d41bc9de by hzc

报表四新增同比值

parent 4a85d4db
...@@ -106,6 +106,9 @@ public class IndicatorsReportFour implements Serializable { ...@@ -106,6 +106,9 @@ public class IndicatorsReportFour implements Serializable {
@Column(name = "trend" ) @Column(name = "trend" )
private Integer trend; private Integer trend;
@Column(name = "trend_value" )
private String trendValue;
/** /**
* 排名标识,1,2,3前三 * 排名标识,1,2,3前三
*/ */
......
...@@ -267,6 +267,8 @@ public class IndicatorsReportService { ...@@ -267,6 +267,8 @@ public class IndicatorsReportService {
String calGowthValue = CalculateUtils.calGowth(calResult.getValue(), String calGowthValue = CalculateUtils.calGowth(calResult.getValue(),
sameCalResult.getValue(),growCalType); sameCalResult.getValue(),growCalType);
if(StringUtils.isNotBlank(calGowthValue)) { if(StringUtils.isNotBlank(calGowthValue)) {
//报表四记录同比值
indicatorsReportFour.setTrendValue(calGowthValue);
if(Double.parseDouble(calResult.getValue())- if(Double.parseDouble(calResult.getValue())-
Double.parseDouble(sameCalResult.getValue()) > 0) { Double.parseDouble(sameCalResult.getValue()) > 0) {
if("0".equals(indRule)) {//正向 if("0".equals(indRule)) {//正向
......
...@@ -6,13 +6,13 @@ ...@@ -6,13 +6,13 @@
<insert id="batchInsert" parameterType="java.util.List"> <insert id="batchInsert" parameterType="java.util.List">
insert into indicators_report_four( insert into indicators_report_four(
result_id,compare_id,ind_id,ind_name,compare_obj,compare_obj_desc,ind_rule, result_id,compare_id,ind_id,ind_name,compare_obj,compare_obj_desc,ind_rule,
compare_date,`value`,value_rank,same_value,average,code, compare_date,`value`,value_rank,same_value,average,code,trend_value,
trend,rank_mark_before,rank_mark_after,rank_improve_before,rank_improve_after,compare_avg,compare_catalog) trend,rank_mark_before,rank_mark_after,rank_improve_before,rank_improve_after,compare_avg,compare_catalog)
values values
<foreach collection="indicatorsReportFours" item="val" separator=","> <foreach collection="indicatorsReportFours" item="val" separator=",">
( (
#{val.resultId},#{val.compareId},#{val.indId},#{val.indName},#{val.compareObj},#{val.compareObjDesc},#{val.indRule}, #{val.resultId},#{val.compareId},#{val.indId},#{val.indName},#{val.compareObj},#{val.compareObjDesc},#{val.indRule},
#{val.compareDate},#{val.value},#{val.valueRank},#{val.sameValue},#{val.average},#{val.code}, #{val.compareDate},#{val.value},#{val.valueRank},#{val.sameValue},#{val.average},#{val.code},#{val.trendValue}
#{val.trend},#{val.rankMarkBefore},#{val.rankMarkAfter},#{val.rankImproveBefore},#{val.rankImproveAfter},#{val.compareAvg},#{val.compareCatalog} #{val.trend},#{val.rankMarkBefore},#{val.rankMarkAfter},#{val.rankImproveBefore},#{val.rankImproveAfter},#{val.compareAvg},#{val.compareCatalog}
) )
</foreach> </foreach>
......
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