kangwei: 水厂运营考核专题:吨水药费详情接口（药剂目标完成情况）

@@ -26,7 +26,7 @@ public interface ReportConstant {
 	//药剂字段
 	public static final String fieldYj = "PAMZ,PAMF,PAMRJ,SCLPAMZ,SCLPAMF,NACLO,PACGT,PACYT,PFS,FHTY,RYXNJ," +
 			"YWL,GXCLJ,CH3COONA,HXT,FECL3,SH,CH3COOH,FESO4G,FESO4Y,H2O2";
-
+	public static final String fieldYj_2 = "PACYT,PACGT,NaClO,SCLPAMF,PAMRJ,PFS,FHTY,RYXNJ,CH3COONA,HXT,FECL3,SH,CH3COOH,FESO4G,FESO4Y,H2O2";
 	//水量字段
 	public static final String fieldClsl = "CSL,JSL";
 	public static final String field_CSL= "CSL";

@@ -319,8 +319,8 @@ public class ReportViewUtil {
 	public  static ReportItemVO getSumValueByTBHB(String reportId, String fields, String departIds , String startTime , String endTime){
 		ReportItemVO reportItemVO = null;
 		String dataViewName3a24_value = ReportViewUtil.buildViewLike(reportId,fields, departIds, startTime,endTime);
-		String dataViewName3a24_valueHB = ReportViewUtil.buildViewLike(reportId,fields, departIds, DateUtils.getHbDate(startTime),DateUtils.getHbDate(startTime));
-		String dataViewName3a24_valueTB = ReportViewUtil.buildViewLike(reportId,fields, departIds, DateUtils.getTbDate(startTime),DateUtils.getTbDate(startTime));
+		String dataViewName3a24_valueHB = ReportViewUtil.buildViewLike(reportId,fields, departIds, DateUtils.getHbDate(startTime),DateUtils.getHbDate(endTime));
+		String dataViewName3a24_valueTB = ReportViewUtil.buildViewLike(reportId,fields, departIds, DateUtils.getTbDate(startTime),DateUtils.getTbDate(endTime));
 
 		String fieldsSql = "";
 		if(StringUtils.isNotEmpty(fields)) {

@@ -26,6 +26,17 @@ public class YJMonthDataVO {
     @ApiModelProperty(value = "同比")
     private String  valueTB;//同比
 
+
+    @ApiModelProperty(value = "环比-比例")
+    private String  valueHB_bl;//环比
+    @ApiModelProperty(value = "同比-比例")
+    private String  valueTB_bl;//同比
+    @ApiModelProperty(value = "单位")
+    private String unit;
+
+
+
+
     public String getMonthTarge() {
         monthTarge = JSUtils.divide(yearTarge,12);
         return monthTarge;
@@ -34,12 +45,23 @@ public class YJMonthDataVO {
     public YJMonthDataVO(){
     }
 
-    public YJMonthDataVO(String yjName, String yjCode, String yearTarge, String value, String valueHB, String valueTB) {
+    public YJMonthDataVO(String yjName, String yjCode, String unit,  String yearTarge, String value, String valueHB, String valueTB) {
         this.yjName = yjName;
         this.yjCode = yjCode;
+        this.unit = unit;
         this.yearTarge = yearTarge;
         this.value = value;
         this.valueHB = valueHB;
         this.valueTB = valueTB;
     }
+
+    public String getValueHB_bl() {
+        String expression = "( "+this.value +"-" +this.valueHB+")*100/"+this.valueHB;
+        return JSUtils.executeExpression(expression ,"0.0");
+    }
+
+    public String getValueTB_bl() {
+        String expression = "( "+this.value +"-" +this.valueTB+")*100/"+this.valueTB;
+        return JSUtils.executeExpression(expression ,"0.0");
+    }
 }