kangwei: 地图隐患排查巡检统计,添加yhNum 、yclNum属性，

@@ -68,12 +68,12 @@ public class ReportItemVO {
     }
     }
 
 
     public String getValueTbBl() {
     public String getValueTbBl() {
-        valueTbBl = JSUtils.executeExpression("("+this.getValue()  + " - " + this.getValueTb() + ") / " +this.getValueTb(),"0.0") ;
+        valueTbBl = JSUtils.executeExpression("("+this.getValue()  + " - " + this.getValueTb() + ") *100/ " +this.getValueTb(),"0.0") ;
         return valueTbBl;
         return valueTbBl;
     }
     }
 
 
     public String getValueHbBl() {
     public String getValueHbBl() {
-        valueHbBl = JSUtils.executeExpression("("+this.getValue()  + " - " + this.getValueHb() + ") / " +this.getValueHb(),"0.0") ;
+        valueHbBl = JSUtils.executeExpression("("+this.getValue()  + " - " + this.getValueHb() + ") *100/ " +this.getValueHb(),"0.0") ;
         return valueHbBl;
         return valueHbBl;
     }
     }
 }
 }

@@ -25,8 +25,36 @@ public class MapDatabaseResult {
 	/**纬度*/
 	/**纬度*/
     @ApiModelProperty(value = "纬度")
     @ApiModelProperty(value = "纬度")
 	private String latitude;
 	private String latitude;
+
+	@ApiModelProperty(value = "隐患未处理数量")
+    private Integer yhNum;
+	@ApiModelProperty(value = "已处理数量")
+	private Integer yclNum;
 	/**隐患排查事件*/
 	/**隐患排查事件*/
     @ApiModelProperty(value = "隐患排查事件")
     @ApiModelProperty(value = "隐患排查事件")
 	private List<DangerDatabaseResult> yhList;
 	private List<DangerDatabaseResult> yhList;
 
 
+	public Integer getYhNum() {
+		yhNum = 0 ;
+		if(yhList != null ){
+			for( DangerDatabaseResult result: yhList){
+				if("1".equals(result.getStatus())){
+					yhNum ++ ;
+				}
+			}
+		}
+		return yhNum;
+	}
+
+	public Integer getYclNum() {
+		yclNum = 0 ;
+		if(yhList != null ){
+			for( DangerDatabaseResult result: yhList){
+				if("2".equals(result.getStatus())){
+					yclNum ++ ;
+				}
+			}
+		}
+		return yclNum;
+	}
 }
 }

@@ -126,7 +126,7 @@ public class OperationReportServiceImpl implements  IOperationReportService {
         //药剂成本高于控制目标--水务公司列表
         //药剂成本高于控制目标--水务公司列表
         dataViewName4411 = ReportViewUtil.buildView(ReportConstant.view4411,"yyh,yhcyqyy", departId, seasonTimeVO.getStartTime(), seasonTimeVO.getEndTime());
         dataViewName4411 = ReportViewUtil.buildView(ReportConstant.view4411,"yyh,yhcyqyy", departId, seasonTimeVO.getStartTime(), seasonTimeVO.getEndTime());
         sql = "select * from ( ";
         sql = "select * from ( ";
-        sql += " select  d.depart_name  'departName',  aaa.depart_id ,  avg(aaa.yyh)  realConsume , IFNULL(tc.target_power,2) 'targetConsume' ,GROUP_CONCAT(aaa.yhcyqyy) 'causeAnalysis' from  "+ dataViewName4411+" aaa";;
+        sql += " select  d.depart_name  'departName',  aaa.depart_id ,  avg(aaa.yyh)  realConsume , IFNULL(tc.target_drug,2) 'targetConsume' ,GROUP_CONCAT(aaa.yhcyqyy) 'causeAnalysis' from  "+ dataViewName4411+" aaa";;
         sql += "  left join report_target_config tc on (tc.depart_id = aaa.depart_id  and tc.target_year='2024')";
         sql += "  left join report_target_config tc on (tc.depart_id = aaa.depart_id  and tc.target_year='2024')";
         sql += "  left join sys_depart d on d.id  = aaa.depart_id ";
         sql += "  left join sys_depart d on d.id  = aaa.depart_id ";
         sql += "  group by aaa.depart_id  )bbb where bbb.realConsume > bbb.targetConsume  ";
         sql += "  group by aaa.depart_id  )bbb where bbb.realConsume > bbb.targetConsume  ";