Merge remote-tracking branch 'origin/master' into master

张雷
sk-module-datafill/src/main/java/com/skua/modules/report/service/impl/OperationReportServiceImpl.java
--- a/sk-module-datafill/src/main/java/com/skua/modules/report/service/impl/OperationReportServiceImpl.java
查看文件 @2df9ad4
+++ b/sk-module-datafill/src/main/java/com/skua/modules/report/service/impl/OperationReportServiceImpl.java
查看文件 @2df9ad4
@@ -112,8 +112,9 @@ public class OperationReportServiceImpl implements  IOperationReportService {
        // fields = "ysjsl,tqysjsl,ysjsldyqntqyy";
        dataViewName4411 = ReportViewUtil.buildView(ReportConstant.view4411,"ysjsl,tqysjsl,ysjsldyqntqyy", departId, seasonTimeVO.getStartTime(),seasonTimeVO.getEndTime());
        // sql = "select  sum( aaa.ysfsl )  'ysfsl' ,   sum( aaa.ysjsl )  'ysjsl' , sum(tc.target_water ) 'target_water' ,   sum(tc.target_power) 'target_power' ,round((sum( aaa.ysfsl ) *100 / sum(tc.target_water )),2) as 'completeRatio'    from  "+dataViewName4411+" aaa";
-        sql = "select  round( (aaa.tqysjsl - aaa.ysjsl ) / aaa.tqysjsl ,2 ) 'ratio' ,  aaa.tqysjsl , aaa.ysjsl , aaa.ysjsldyqntqyy 'causeAnalysis' , d.depart_name from "+dataViewName4411 +" aaa";
+        sql = " select bbb.* , d.depart_name from (";
-        sql += "  left join sys_depart d on d.id = aaa.depart_id  where aaa.tqysjsl > aaa.ysjsl ";
+        sql += "select  aaa.depart_id,  round( (aaa.tqysjsl - aaa.ysjsl ) / aaa.tqysjsl ,2 ) 'ratio' ,  aaa.tqysjsl , aaa.ysjsl , aaa.ysjsldyqntqyy 'causeAnalysis' from "+dataViewName4411 +" aaa    where aaa.tqysjsl > aaa.ysjsl   )bbb";
+        sql += "  left join sys_depart d on d.id = bbb.depart_id  ";
        List<FReportWaterMonthDataVO> waterMonthDataList = getJdbcTemplate().query(sql,new BeanPropertyRowMapper<FReportWaterMonthDataVO>(FReportWaterMonthDataVO.class));
        productDataVO.setWaterDeptartList(waterMonthDataList);
@@ -130,10 +131,12 @@ public class OperationReportServiceImpl implements  IOperationReportService {
        //药剂成本高于控制目标--水务公司列表
        dataViewName4411 = ReportViewUtil.buildViewLike(ReportConstant.view4411,"ysjsl,yyh,qntqyh,qntqyh,yhgyqntqyy,bnsjyh,bnyhmb", departId, seasonTimeVO.getStartTime(),seasonTimeVO.getEndTime(),"max");
        // sql = "select  round((aaa.yyh/aaa.ysjsl),2)   'realConsume',aaa.ysjsl,aaa.qntqyh,aaa.qntqyh,aaa.yhgyqntqyy '',aaa.bnsjyh,aaa.bnyhmb,aaa.depart_id  ,d.depart_name  ,IFNULL(tc.target_drug,'-') 'targetConsume'   from   " + dataViewName4411 + " aaa ";
-        sql = "select  round((aaa.yyh/aaa.ysjsl),2)   'realConsume',aaa.yhgyqntqyy 'causeAnalysis',d.depart_name 'deptartName' ,IFNULL(tc.target_drug,'-') 'targetConsume'   from   " + dataViewName4411 + " aaa ";
+        sql = " select bbb.* , d.depart_name 'deptartName'  from (";
+        sql += "select   aaa.depart_id , IFNULL(tc.target_drug,0)  target_drug,  round((aaa.yyh/aaa.ysjsl),2) 'realConsume',  aaa.yhgyqntqyy 'causeAnalysis', IFNULL(tc.target_drug,'-') 'targetConsume'   from   " + dataViewName4411 + " aaa   ";
        sql += "   left join report_target_config tc on (tc.depart_id = aaa.depart_id and tc.target_year ="+year+")";
-        sql+= "  left join sys_depart d on d.id  = aaa.depart_id  ";
+        sql += ") bbb";
-        sql += " where (aaa.ysjsl/aaa.ysjsl) > IFNULL(tc.target_drug,0)";
+        sql+= "  left join sys_depart d on d.id  = bbb.depart_id  ";
+        sql += " where bbb.realConsume > bbb.target_drug";
        List<FReportPowerMonthDataVO> drugDataList = getJdbcTemplate().query(sql,new BeanPropertyRowMapper<FReportPowerMonthDataVO>(FReportPowerMonthDataVO.class));
        productDataVO.setDrugDeptartList(drugDataList);