测试报表四

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

@@ -33,7 +33,7 @@ public class IndicatorsReportFour  implements Serializable {
 	 * 对标单元id
 	 */
    	@Column(name = "compare_id" )
-	private Integer compareId;
+	private String compareId;
 
 	/**
 	 * 指标id

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

@@ -210,6 +210,9 @@ public class IndicatorsReportService {
 					indicatorsReportFour.setIndId(driveIndDef.getIndId());
 					indicatorsReportFour.setIndName(driveIndDef.getIndName());
 					indicatorsReportFour.setIndRule(indRule);
+					indicatorsReportFour.setCompareId(compareId);
+					indicatorsReportFour.setValue(calResult.getValue());
+
 					//设置对标单元目录
 					indicatorsReportFour.setCompareCatalog(compareCatalog);
 					indicatorsReportFour.setCode(code);
@@ -228,7 +231,7 @@ public class IndicatorsReportService {
 						//对比平均数
 						indicatorsReportFour.setCompareAvg(compareAvg);
                         //末三
-						indicatorsReportFour.setRankMarkAfter(rankMarkAfterMap.get(calResult.getCompareId()));
+						indicatorsReportFour.setRankMarkAfter(rankMarkAfterMap.get(calResult.getCompareObj()));
 						//前三
 						indicatorsReportFour.setRankMarkBefore(rankMarkBeforeMap.get(calResult.getCompareObj()));
 						//报表四数据===============end