kangwei: 完善“运营季报”接口的数据格式

          修改水厂结算接口bug

@@ -43,7 +43,7 @@
     <!--  根据入库单ids，获取水厂结算单详情-->
     <!--  根据入库单ids，获取水厂结算单详情-->
     <select id="queryWaterDepartSettlementByMaterialIds" resultType="com.skua.modules.erp.vo.ErpSettlementItemVO">
     <select id="queryWaterDepartSettlementByMaterialIds" resultType="com.skua.modules.erp.vo.ErpSettlementItemVO">
          select d.depart_name, dc.contract_name ,dc.project_name, dc.contract_code, dm.distribut_price 'unit_price'  , pm.good_brand , pm.good_origin, mf.jishu_file_path,  mf.appearance_info,  mf.matched_info ,mf.handle_msg,mf.sender_sign,mf.receiver_sign,  dm.tax_amount ,
          select d.depart_name, dc.contract_name ,dc.project_name, dc.contract_code, dm.distribut_price 'unit_price'  , pm.good_brand , pm.good_origin, mf.jishu_file_path,  mf.appearance_info,  mf.matched_info ,mf.handle_msg,mf.sender_sign,mf.receiver_sign,  dm.tax_amount ,
-         round(dm.distribut_price * mi.material_num,2)  total_price, round(pm.distribut_price * mi.material_num *100 /(100+ ifnull(dm.tax_amount,0)) ,2)  total_price_tax,
+         round(dm.distribut_price * mi.material_num,2)  total_price, round(pm.unit_price * mi.material_num *100 /(100+ ifnull(dm.tax_amount,0)) ,2)  total_price_tax,
              mi.depart_id , mi.distribut_contract_id ,mi.purchase_contract_id, mi.material_num,
              mi.depart_id , mi.distribut_contract_id ,mi.purchase_contract_id, mi.material_num,
              mi.arrive_time ,mi.remark,mi.sparepart_type,mi.sparepart_id,mi.sparepart_name,mi.sparepart_code,mi.specification,  mi.measuring_unit,mi.good_code,mi.id 'material_in_id'
              mi.arrive_time ,mi.remark,mi.sparepart_type,mi.sparepart_id,mi.sparepart_name,mi.sparepart_code,mi.specification,  mi.measuring_unit,mi.good_code,mi.id 'material_in_id'
         from erp_material_in mi
         from erp_material_in mi

@@ -115,7 +115,7 @@ public class OperationReportServiceImpl implements  IOperationReportService {
         //水电耗高于控制目标--水务公司列表
         //水电耗高于控制目标--水务公司列表
         dataViewName4411 = ReportViewUtil.buildView(ReportConstant.view4411,"ydh,dhcmbzyy", departId, seasonTimeVO.getStartTime(), seasonTimeVO.getEndTime());
         dataViewName4411 = ReportViewUtil.buildView(ReportConstant.view4411,"ydh,dhcmbzyy", departId, seasonTimeVO.getStartTime(), seasonTimeVO.getEndTime());
         sql = "select * from ( ";
         sql = "select * from ( ";
-        sql += " select  d.depart_name  'departName',  aaa.depart_id ,  avg(aaa.ydh)  realConsume , IFNULL(tc.target_power,2) 'targetConsume' ,GROUP_CONCAT(aaa.dhcmbzyy) 'causeAnalysis' from  "+ dataViewName4411+" aaa";;
+        sql += " select  d.depart_name  'departName',  aaa.depart_id ,  round(avg(aaa.ydh),2)  realConsume , IFNULL(tc.target_power,2) 'targetConsume' ,GROUP_CONCAT(aaa.dhcmbzyy) '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  ";
@@ -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_drug,2) 'targetConsume' ,GROUP_CONCAT(aaa.yhcyqyy) 'causeAnalysis' from  "+ dataViewName4411+" aaa";;
+        sql += " select  d.depart_name  'departName',  aaa.depart_id ,  round(avg(aaa.yyh),2)  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  ";

@@ -53,4 +53,11 @@ public class InspectionTaskOverviewDetailVO {
         }
         }
         return processedAbnormalRate;
         return processedAbnormalRate;
     }
     }
+
+    public Integer getNormalInspectionTaskCount() {
+        normalInspectionTaskCount = checkedInspectionTaskCount - abnormalInspectionTaskCount;
+        return normalInspectionTaskCount;
+    }
+
+
 }
 }