计划流程管控新增字段

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

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 检修计划全流程管理对象 pdm_maintenance_process
- * 
+ *
  * @author ruoyi
  * @date 2024-12-05
  */
@@ -24,6 +24,10 @@ public class PdmMaintenanceProcess extends BaseEntity
     @Excel(name = "月计划编号")
     private String planCode;
 
+    /** 周计划编号 */
+    //@Excel(name = "周计划编号")
+    private String planCodeW;
+
     /** 月计划停电设备数 */
     @Excel(name = "月计划停电设备数")
     private Long powerOutageDevices;
@@ -84,152 +88,6 @@ public class PdmMaintenanceProcess extends BaseEntity
 
     private String approveFileName;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setPlanCode(String planCode) 
-    {
-        this.planCode = planCode;
-    }
-
-    public String getPlanCode() 
-    {
-        return planCode;
-    }
-    public void setPowerOutageDevices(Long powerOutageDevices) 
-    {
-        this.powerOutageDevices = powerOutageDevices;
-    }
-
-    public Long getPowerOutageDevices() 
-    {
-        return powerOutageDevices;
-    }
-    public void setPerHourHouseholdsM(Long perHourHouseholdsM) 
-    {
-        this.perHourHouseholdsM = perHourHouseholdsM;
-    }
-
-    public Long getPerHourHouseholdsM() 
-    {
-        return perHourHouseholdsM;
-    }
-    public void setPerHourHouseholdsW(Long perHourHouseholdsW) 
-    {
-        this.perHourHouseholdsW = perHourHouseholdsW;
-    }
-
-    public Long getPerHourHouseholdsW() 
-    {
-        return perHourHouseholdsW;
-    }
-    public void setCity(String city) 
-    {
-        this.city = city;
-    }
-
-    public String getCity() 
-    {
-        return city;
-    }
-    public void setCounty(String county) 
-    {
-        this.county = county;
-    }
-
-    public String getCounty() 
-    {
-        return county;
-    }
-    public void setStation(String station) 
-    {
-        this.station = station;
-    }
-
-    public String getStation() 
-    {
-        return station;
-    }
-    public void setLineCode(String lineCode) 
-    {
-        this.lineCode = lineCode;
-    }
-
-    public String getLineCode() 
-    {
-        return lineCode;
-    }
-    public void setLineName(String lineName) 
-    {
-        this.lineName = lineName;
-    }
-
-    public String getLineName() 
-    {
-        return lineName;
-    }
-    public void setPerHourHouseholdsArtif(Long perHourHouseholdsArtif) 
-    {
-        this.perHourHouseholdsArtif = perHourHouseholdsArtif;
-    }
-
-    public Long getPerHourHouseholdsArtif() 
-    {
-        return perHourHouseholdsArtif;
-    }
-    public void setDeclarAgency(String declarAgency)
-    {
-        this.declarAgency =
-declarAgency;
-    }
-
-    public String getDeclarAgency()
-    {
-        return declarAgency;
-    }
-    public void setIsMaintenance(String isMaintenance) 
-    {
-        this.isMaintenance = isMaintenance;
-    }
-
-    public String getIsMaintenance() 
-    {
-        return isMaintenance;
-    }
-    public void setIsApprove(String isApprove) 
-    {
-        this.isApprove = isApprove;
-    }
-
-    public String getIsApprove() 
-    {
-        return isApprove;
-    }
-    public void setMaintenanceFilePath(String maintenanceFilePath) 
-    {
-        this.maintenanceFilePath = maintenanceFilePath;
-    }
-
-    public String getMaintenanceFilePath() 
-    {
-        return maintenanceFilePath;
-    }
-    public void setApproveFilePath(String approveFilePath) 
-    {
-        this.approveFilePath = approveFilePath;
-    }
-
-    public String getApproveFilePath() 
-    {
-        return approveFilePath;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -3,10 +3,11 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.powerdistribution.mapper.PdmMaintenanceProcessMapper">
-    
+
     <resultMap type="PdmMaintenanceProcess" id="PdmMaintenanceProcessResult">
         <result property="id"    column="id"    />
         <result property="planCode"    column="plan_code"    />
+        <result property="planCodeW"    column="plan_code_w"    />
         <result property="powerOutageDevices"    column="power_outage_devices"    />
         <result property="perHourHouseholdsM"    column="per_hour_households_m"    />
         <result property="perHourHouseholdsW"    column="per_hour_households_w"    />
@@ -30,13 +31,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectPdmMaintenanceProcessVo">
-        select id, plan_code, power_outage_devices, per_hour_households_m, per_hour_households_w, city, county, station, line_code, line_name, per_hour_households_artif,declar_agency, is_maintenance, is_approve, maintenance_file_path,maintenance_file_name, approve_file_path,approve_file_name, create_by, create_time, update_by, update_time from pdm_maintenance_process
+        select id, plan_code,plan_code_w, power_outage_devices, per_hour_households_m, per_hour_households_w, city, county, station, line_code, line_name, per_hour_households_artif,declar_agency, is_maintenance, is_approve, maintenance_file_path,maintenance_file_name, approve_file_path,approve_file_name, create_by, create_time, update_by, update_time from pdm_maintenance_process
     </sql>
 
     <select id="selectPdmMaintenanceProcessList" parameterType="PdmMaintenanceProcess" resultMap="PdmMaintenanceProcessResult">
         <include refid="selectPdmMaintenanceProcessVo"/>
-        <where>  
+        <where>
             <if test="planCode != null  and planCode != ''"> and plan_code like concat('%', #{planCode}, '%')</if>
+            <if test="planCodeW != null  and planCodeW != ''"> and plan_code_w like concat('%', #{planCodeW}, '%')</if>
             <if test="powerOutageDevices != null "> and power_outage_devices = #{powerOutageDevices}</if>
             <if test="perHourHouseholdsM != null "> and per_hour_households_m = #{perHourHouseholdsM}</if>
             <if test="perHourHouseholdsW != null "> and per_hour_households_w = #{perHourHouseholdsW}</if>
@@ -53,12 +55,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approveFilePath != null  and approveFilePath != ''"> and approve_file_path = #{approveFilePath}</if>
         </where>
     </select>
-    
+
     <select id="selectPdmMaintenanceProcessById" parameterType="Long" resultMap="PdmMaintenanceProcessResult">
         <include refid="selectPdmMaintenanceProcessVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertPdmMaintenanceProcess" parameterType="PdmMaintenanceProcess" useGeneratedKeys="true" keyProperty="id">
         insert into pdm_maintenance_process
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -138,9 +140,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deletePdmMaintenanceProcessByIds" parameterType="String">
-        delete from pdm_maintenance_process where id in 
+        delete from pdm_maintenance_process where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
+</mapper>