添加报表字段和值填充逻辑

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

@@ -19,6 +19,7 @@ public class IndicatorsReportOne {
 	
 	private String indId;//指标编号
 	private String indName;//指标名称
+	private String compareUnitId;//对标单元id
 	private String compareObj;//对标对象编号
 	private String compareObjDesc;//对标对象描述
 	private Integer compareDate;//对标日期

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

@@ -30,6 +30,7 @@ public class IndicatorsReportTwo {
 	private String averageRate;//全省平均分同比
 	private String trend;//指标变化趋势   0：趋好    1：趋坏
 	private String currentAverage;//本期实际平均值
+	private String sameAverage;//同期实际平均值
 	private String bestUnit;//标杆单位
 	private String bestUnitDesc;//标杆单位描述
 	private String bestUnitValue;//标杆值

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

@@ -197,6 +197,8 @@ public class IndicatorsReportService {
 				indReportData.setCode(calData.getCode());
 				indReportData.setCompareType(type);
 				indReportData.setUnit(calData.getUnit());
+				//设置对标单元id
+				indReportData.setCompareUnitId(compareId);
 				indReportData = this.fillReportOneData(calData, indReportData);
 				datas.add(indReportData);
 			}
@@ -246,6 +248,7 @@ public class IndicatorsReportService {
 		objSort.put("4313",13);objSort.put("4331",14);
 		
 		String average = null;//定义存储指标组内平均值
+		String sameAverage = null;//定义存储指标组内同期平均值
 		//根据指标id获取指标详情
 		DriveIndDef driveIndDef = driveIndDefMapper.selectByPrimaryKey(indId);
 		if(driveIndDef!=null) {
@@ -295,6 +298,22 @@ public class IndicatorsReportService {
 					}
 				}
 			}
+			//填充同期实际平均值
+			Map<String,Object> paramMap = new HashMap<>();
+			paramMap.put("indId", indId);
+			paramMap.put("date", (date-100));
+			paramMap.put("compareObjs", compareObjs);
+			List<DriveIndCalResultDef> sameCalDatas = driveIndCalResultDefMapper
+					.findByIndIdAndDateAndCompareObjIn(paramMap);
+			if(!sameCalDatas.isEmpty()) {
+				if(sameCalDatas.get(0).getActualAverage()!=null && 
+						!"0.0".equals(sameCalDatas.get(0).getActualAverage())) {
+					sameAverage = sameCalDatas.get(0).getActualAverage();
+				}else {
+					sameAverage = sameCalDatas.get(0).getAverage();
+				}
+				indReportData.setSameAverage(sameAverage);
+			}
 			//填充本期实际平均值
 			if(calDatas.get(0).getActualAverage()!=null && 
 					!"0.0".equals(calDatas.get(0).getActualAverage())) {

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

@@ -15,7 +15,8 @@
 		insert into indicators_report_one(
   		ind_id,  ind_name,  compare_obj,  compare_obj_desc,  compare_date,  compare_type,  unit,  depart,  
   		catalog_type,  current_value,  last_same_value,  value_rate,  current_rank,  last_same_rank,  
-  		current_score,  current_improve,  last_same_score,  last_same_improve,  code)
+  		current_score,  current_improve,  last_same_score,  last_same_improve,  code, value_rate_rank,
+  		compare_unit_id)
   		values
 		<foreach collection="datas" item="val" separator=",">
 			(
@@ -23,7 +24,7 @@
 			#{val.compareType},#{val.unit},#{val.depart},#{val.catalogType},#{val.currentValue},
 			#{val.lastSameValue},#{val.valueRate},#{val.currentRank},#{val.lastSameRank},
 			#{val.currentScore},#{val.currentImprove},#{val.lastSameScore},#{val.lastSameImprove},
-			#{val.code}
+			#{val.code},#{val.valueRateRank},#{val.compareUnitId}
 			)
 		</foreach>
 	</insert>
@@ -89,6 +90,12 @@
                 <if test="val.code != null">
                     code = #{val.code},
                 </if>
+                <if test="val.valueRateRank != null">
+                    value_rate_rank = #{val.valueRateRank},
+                </if>
+                <if test="val.compareUnitId != null">
+                    compare_unit_id = #{val.compareUnitId},
+                </if>
             </set>
             where id = ${val.id}
          </foreach>

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

@@ -17,7 +17,7 @@
   		same_actual_average,average_rate,trend,current_average,best_unit,best_unit_desc,best_unit_value,
   		best_average_units,same_improve_units,rank_head_three,rank_head_three_desc,rank_after_three,
   		rank_after_three_desc,same_improve_head_three,same_improve_head_three_desc,same_improve_after_three,
-  		same_improve_after_three_desc)
+  		same_improve_after_three_desc,same_average)
   		values
 		<foreach collection="datas" item="val" separator=",">
 			(
@@ -26,7 +26,7 @@
 			#{val.trend},#{val.currentAverage},#{val.bestUnit},#{val.bestUnitDesc},#{val.bestUnitValue},
 			#{val.bestAverageUnits},#{val.sameImproveUnits},#{val.rankHeadThree},#{val.rankHeadThreeDesc},
 			#{val.rankAfterThree},#{val.rankAfterThreeDesc},#{val.sameImproveHeadThree},#{val.sameImproveHeadThreeDesc},
-			#{val.sameImproveAfterThree},#{val.sameImproveAfterThreeDesc}
+			#{val.sameImproveAfterThree},#{val.sameImproveAfterThreeDesc},#{val.sameAverage}
 			)
 		</foreach>
 	</insert>
@@ -113,6 +113,9 @@
                 <if test="val.sameImproveAfterThreeDesc != null">
                     same_improve_after_three_desc = #{val.sameImproveAfterThreeDesc},
                 </if>
+                <if test="val.sameAverage != null">
+                    same_average = #{val.sameAverage},
+                </if>
             </set>
             where id = ${val.id}
          </foreach>