Merge branch 'master' of http://39.105.58.247:3100/hydw/hycw

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/controller/PdmMaintenanceCompletionStatisticsController.java

@@ -2,6 +2,8 @@ package com.ruoyi.powerdistribution.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -41,6 +43,14 @@ public class PdmMaintenanceCompletionStatisticsController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(PdmMaintenanceCompletionStatistics pdmMaintenanceCompletionStatistics)
     {
+        if(StringUtils.isNotEmpty(pdmMaintenanceCompletionStatistics.getMaintenanceOverdue())){
+            pdmMaintenanceCompletionStatistics.setMaintenanceOverdueUnit(pdmMaintenanceCompletionStatistics.getMaintenanceOverdue().split("\\|")[1]);
+            pdmMaintenanceCompletionStatistics.setMaintenanceOverdueVal(pdmMaintenanceCompletionStatistics.getMaintenanceOverdue().split("\\|")[0]);
+        }
+        if(StringUtils.isNotEmpty(pdmMaintenanceCompletionStatistics.getRepeatPowerCut())){
+            pdmMaintenanceCompletionStatistics.setRepeatPowerCutUnit(pdmMaintenanceCompletionStatistics.getRepeatPowerCut().split("\\|")[1]);
+            pdmMaintenanceCompletionStatistics.setRepeatPowerCutVal(pdmMaintenanceCompletionStatistics.getRepeatPowerCut().split("\\|")[0]);
+        }
         startPage();
         List<PdmMaintenanceCompletionStatistics> list = pdmMaintenanceCompletionStatisticsService.selectPdmMaintenanceCompletionStatisticsList(pdmMaintenanceCompletionStatistics);
         return getDataTable(list);

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/PdmMaintenanceCompletionStatistics.java

@@ -3,6 +3,7 @@ package com.ruoyi.powerdistribution.domain;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -14,6 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2024-12-03
  */
+@Data
 public class PdmMaintenanceCompletionStatistics extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -103,6 +105,26 @@ public class PdmMaintenanceCompletionStatistics extends BaseEntity
     /** 奖励金额 */
     @Excel(name = "奖励金额")
     private BigDecimal rewardAmount;
+    /**
+     * 重复停电
+     */
+    private String repeatPowerCut;
+    /**
+     * 计划检修超期
+     */
+    private String maintenanceOverdue;
+
+    private String maintenanceOverdueUnit;
+    private String maintenanceOverdueVal;
+
+    /**
+     * 重复停电
+     */
+    private String repeatPowerCutUnit;
+    /**
+     * 重复停电
+     */
+    private String repeatPowerCutVal;
 
     public void setEventNo(String eventNo) 
     {

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

@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectPdmMaintenanceCompletionStatisticsVo">
-        select event_no, elect_line_name, branch_name, data_status, push_status, is_maintainable, is_pure_specia, event_type, power_outage_start, power_outage_end, power_outage_during_households, power_outage_nature, city, county, station, oran_no, substation_name, power_outage_households, power_outage_line, fault_free_duration, reward_amount from pdm_maintenance_completion_statistics
+        select event_no, elect_line_name, branch_name, data_status, push_status, is_maintainable, is_pure_specia, event_type, power_outage_start, power_outage_end, power_outage_during_households, power_outage_nature, city, county, station, oran_no, substation_name, power_outage_households, power_outage_line, fault_free_duration, reward_amount from pdm_maintenance_completion_statistics a
     </sql>
 
     <select id="selectPdmMaintenanceCompletionStatisticsList" parameterType="PdmMaintenanceCompletionStatistics" resultMap="PdmMaintenanceCompletionStatisticsResult">
@@ -56,6 +56,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="powerOutageLine != null "> and power_outage_line = #{powerOutageLine}</if>
             <if test="faultFreeDuration != null  and faultFreeDuration != ''"> and fault_free_duration = #{faultFreeDuration}</if>
             <if test="rewardAmount != null "> and reward_amount = #{rewardAmount}</if>
+            <if test="maintenanceOverdue != null and maintenanceOverdue!=''">
+                <if test="maintenanceOverdueUnit == 'month'">
+                  and  TIMESTAMPDIFF(MONTH,create_time, SYSDATE()) &gt; ${maintenanceOverdueVal}
+                  and  not exists(select 1 from pdm_maintenance_completion_statistics c where TIMESTAMPDIFF(MONTH,c.create_time, SYSDATE()) &gt; ${maintenanceOverdueVal} and c.elect_line_name=a.elect_line_name
+                  and  c.branch_name=a.branch_name)
+                </if>
+                <if test="maintenanceOverdueUnit == 'year'">
+                    and  TIMESTAMPDIFF(YEAR,create_time, SYSDATE()) &gt; ${maintenanceOverdueVal}
+                    and  not exists(select 1 from pdm_maintenance_completion_statistics c where TIMESTAMPDIFF(YEAR,c.create_time, SYSDATE()) &gt; ${maintenanceOverdueVal} and c.elect_line_name=a.elect_line_name
+                    and  c.branch_name=a.branch_name)
+                </if>
+             </if>
+            <if test="repeatPowerCut != null and repeatPowerCut!=''">
+                <if test="repeatPowerCutUnit == '次'">
+                    and  (select count(1) from pdm_maintenance_completion_statistics c where  c.elect_line_name=a.elect_line_name
+                    and  c.branch_name=a.branch_name) &gt; ${repeatPowerCutVal}
+                </if>
+            </if>
         </where>
     </select>