报表四加入同期值

src/main/java/com/keymobile/indicators/model/entity/report/IndicatorsReportFour.java

@@ -78,6 +78,11 @@ public class IndicatorsReportFour  implements Serializable {
 	private String value;
 
 	/**
+	 * 同期值
+	 */
+	@Column(name = "same_value" )
+   	private String sameValue;
+	/**
 	 * 平均值
 	 */
    	@Column(name = "average" )

src/main/java/com/keymobile/indicators/service/report/IndicatorsReportService.java

@@ -252,7 +252,8 @@ public class IndicatorsReportService {
 								indReportData.setEffectiveIndCount(
 										indReportData.getEffectiveIndCount()+1);
 							}
-							
+							//保存同期值
+							indicatorsReportFour.setSameValue(sameCalResult.getValue());
 							//算增幅
 							if(!"NaN".equals(sameCalResult.getValue()) 
 									&& !"Infinite".equals(sameCalResult.getValue())
@@ -267,7 +268,7 @@ public class IndicatorsReportService {
 											Double.parseDouble(sameCalResult.getValue()) > 0) {
 										if("0".equals(indRule)) {//正向
 											//报表四记录同比趋向
-											indicatorsReportFour.setTrend(1);
+											indicatorsReportFour.setTrend(0);
 											//填充指标提升个数
 											if(indReportData.getIndImproveCount()==null) {
 												indReportData.setIndImproveCount(1);
@@ -277,7 +278,7 @@ public class IndicatorsReportService {
 											}
 										}else {//反向
 											//报表四记录同比趋向
-											indicatorsReportFour.setTrend(0);
+											indicatorsReportFour.setTrend(1);
 											//填充指标降低个数
 											if(indReportData.getIndReduceCount()==null) {
 												indReportData.setIndReduceCount(1);
@@ -291,7 +292,7 @@ public class IndicatorsReportService {
 											Double.parseDouble(sameCalResult.getValue()) < 0) {
 										if("1".equals(indRule)) {//反向
 											//报表四记录同比趋向
-											indicatorsReportFour.setTrend(1);
+											indicatorsReportFour.setTrend(0);
 											//填充指标提升个数
 											if(indReportData.getIndImproveCount()==null) {
 												indReportData.setIndImproveCount(1);
@@ -301,7 +302,7 @@ public class IndicatorsReportService {
 											}
 										}else {//正向
 											//报表四记录同比趋向
-											indicatorsReportFour.setTrend(0);
+											indicatorsReportFour.setTrend(1);
 											//填充指标降低个数
 											if(indReportData.getIndReduceCount()==null) {
 												indReportData.setIndReduceCount(1);

src/main/resources/mybatis/mapping/IndicatorsReportFourMapper.xml

@@ -5,13 +5,13 @@
     
     <insert id="batchInsert" parameterType="java.util.List">
 		insert into indicators_report_four(
-		result_id,compare_id,ind_id,ind_name,compare_obj,compare_obj_desc,ind_rule,compare_date,`value`,average,code,
+		result_id,compare_id,ind_id,ind_name,compare_obj,compare_obj_desc,ind_rule,compare_date,`value`,same_value,average,code,
 		trend,rank_mark_before,rank_mark_after,compare_avg,compare_catalog)
   		values
 		<foreach collection="indicatorsReportFours" item="val" separator=",">
 			(
             #{val.resultId},#{val.compareId},#{val.indId},#{val.indName},#{val.compareObj},#{val.compareObjDesc},#{val.indRule},
-            #{val.compareDate},#{val.value},#{val.average},#{val.code},#{val.trend},#{val.rankMarkBefore},#{val.rankMarkAfter},
+            #{val.compareDate},#{val.value},#{val.sameValue},#{val.average},#{val.code},#{val.trend},#{val.rankMarkBefore},#{val.rankMarkAfter},
             #{val.compareAvg},#{val.compareCatalog}
 			)
 		</foreach>