1

ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmReportPlanDayMapper.xml

@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(ifnull(temporary_sum,0)) temporary_sum,
         sum(ifnull(temporary_cancel_sum,0)) temporary_cancel_sum,
         CONCAT(round((sum(ifnull(temporary_sum,0))-sum(ifnull(temporary_cancel_sum,0)))/sum(ifnull(temporary_sum,0))*100,2),'%')  temporary_ratio,
-        null temporary_plan_ratio,
+        CONCAT(round(sum(ifnull(temporary_sum,0))/(sum(ifnull(week_sum,0))+sum(ifnull(temporary_sum,0)))*100,2),'%') temporary_plan_ratio,
         null create_by ,
         null create_time,
         null update_by,

ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmReportPlanWeekMapper.xml

@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(ifnull(temporary_sum,0)) temporary_sum,
         sum(ifnull(temporary_cancel_sum,0)) temporary_cancel_sum,
         CONCAT(round((sum(ifnull(temporary_sum,0))-sum(ifnull(temporary_cancel_sum,0)))/sum(ifnull(temporary_sum,0))*100,2),'%')  temporary_ratio,
-        null temporary_plan_ratio,
+        CONCAT(round(sum(ifnull(temporary_sum,0))/(sum(ifnull(week_sum,0))+sum(ifnull(temporary_sum,0)))*100,2),'%') temporary_plan_ratio,
         null create_by ,
         null create_time,
         null update_by,