工程量查询新增字段

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

@@ -42,12 +42,12 @@ public class PdmWorkCompleStatisticsController extends BaseController
     /**
      * 查询工程量完成情况列表
      */
-    @ApiOperation(value = "查询可靠性停电记录列表")
+    @ApiOperation(value = "查询工程量完成情况列表")
     @GetMapping("/list")
     public TableDataInfo list(PdmWorkCompleStatistics pdmWorkCompleStatistics)
     {
         startPage();
-        List<PdmWorkCompleStatisticsVO> list = pdmWorkCompleStatisticsService.selectPdmWorkCompleStatistics(pdmWorkCompleStatistics);
+        List<PdmWorkCompleStatistics> list = pdmWorkCompleStatisticsService.selectPdmWorkCompleStatisticsList(pdmWorkCompleStatistics);
         return getDataTable(list);
     }
     /**

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

@@ -10,7 +10,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 工程量完成情况对象 pdm_work_comple_statistics
  *
  * @author ruoyi
- * @date 2025-01-22
+ * @date 2025-02-11
  */
 public class PdmWorkCompleStatistics extends BaseEntity
 {
@@ -151,6 +151,94 @@ public class PdmWorkCompleStatistics extends BaseEntity
     @Excel(name = "ETL时间戳 ")
     private String etlTm;
 
+    /** 10kV线路电缆周完成量 */
+    @Excel(name = "10kV线路电缆周完成量")
+    private BigDecimal lineCableNewAccuQtWeek;
+
+    /** 10kV线路架空周完成量 */
+    @Excel(name = "10kV线路架空周完成量")
+    private BigDecimal lineOverhdNewAccuQtWeek;
+
+    /** 配电变压器周完成量 */
+    @Excel(name = "配电变压器周完成量")
+    private BigDecimal distTransNewAccuQtWeek;
+
+    /** 低压线路周完成量 */
+    @Excel(name = "低压线路周完成量")
+    private BigDecimal lowVoltLineAccuQtWeek;
+
+    /** 杆塔基周完成量 */
+    @Excel(name = "杆塔基周完成量")
+    private BigDecimal towerAccuQtWeek;
+
+    /** 环网柜台周完成量 */
+    @Excel(name = "环网柜台周完成量")
+    private BigDecimal ringCabinetAccuQtWeek;
+
+    /** 柱上断路器台周完成量 */
+    @Excel(name = "柱上断路器台周完成量")
+    private BigDecimal poleTabAccuQtWeek;
+
+    /** 10kV线路电缆作业完成量 */
+    @Excel(name = "10kV线路电缆作业完成量")
+    private BigDecimal lineCableNewAccuQtWork;
+
+    /** 10kV线路架空作业完成量 */
+    @Excel(name = "10kV线路架空作业完成量")
+    private BigDecimal lineOverhdNewAccuQtWork;
+
+    /** 配电变压器作业完成量 */
+    @Excel(name = "配电变压器作业完成量")
+    private BigDecimal distTransNewAccuQtWork;
+
+    /** 低压线路作业完成量 */
+    @Excel(name = "低压线路作业完成量")
+    private BigDecimal lowVoltLineAccuQtWork;
+
+    /** 杆塔基作业完成量 */
+    @Excel(name = "杆塔基作业完成量")
+    private BigDecimal towerAccuQtWork;
+
+    /** 环网柜台作业完成量 */
+    @Excel(name = "环网柜台作业完成量")
+    private BigDecimal ringCabinetAccuQtWork;
+
+    /** 柱上断路器台作业完成量 */
+    @Excel(name = "柱上断路器台作业完成量")
+    private BigDecimal poleTabAccuQtWork;
+
+    /** 10kV线路电缆作业周完成量 */
+    @Excel(name = "10kV线路电缆作业周完成量")
+    private BigDecimal lineCableNewAccuQtWorkWeek;
+
+    /** 10kV线路架空作业周完成量 */
+    @Excel(name = "10kV线路架空作业周完成量")
+    private BigDecimal lineOverhdNewAccuQtWorkWeek;
+
+    /** 配电变压器作业周完成量 */
+    @Excel(name = "配电变压器作业周完成量")
+    private BigDecimal distTransNewAccuQtWorkWeek;
+
+    /** 低压线路作业周完成量 */
+    @Excel(name = "低压线路作业周完成量")
+    private BigDecimal lowVoltLineAccuQtWorkWeek;
+
+    /** 杆塔基作业周完成量 */
+    @Excel(name = "杆塔基作业周完成量")
+    private BigDecimal towerAccuQtWorkWeek;
+
+    /** 环网柜台作业周完成量 */
+    @Excel(name = "环网柜台作业周完成量")
+    private BigDecimal ringCabinetAccuQtWorkWeek;
+
+    /** 柱上断路器台作业周完成量 */
+    @Excel(name = "柱上断路器台作业周完成量")
+    private BigDecimal poleTabAccuQtWorkWeek;
+
+    /** 异常标志 0否1是 */
+    @Excel(name = "异常标志 0否1是")
+    private String excType;
+
     public void setBatchId(String batchId)
     {
         this.batchId = batchId;
@@ -457,6 +545,204 @@ public class PdmWorkCompleStatistics extends BaseEntity
     {
         return etlTm;
     }
+    public void setLineCableNewAccuQtWeek(BigDecimal lineCableNewAccuQtWeek)
+    {
+        this.lineCableNewAccuQtWeek = lineCableNewAccuQtWeek;
+    }
+
+    public BigDecimal getLineCableNewAccuQtWeek()
+    {
+        return lineCableNewAccuQtWeek;
+    }
+    public void setLineOverhdNewAccuQtWeek(BigDecimal lineOverhdNewAccuQtWeek)
+    {
+        this.lineOverhdNewAccuQtWeek = lineOverhdNewAccuQtWeek;
+    }
+
+    public BigDecimal getLineOverhdNewAccuQtWeek()
+    {
+        return lineOverhdNewAccuQtWeek;
+    }
+    public void setDistTransNewAccuQtWeek(BigDecimal distTransNewAccuQtWeek)
+    {
+        this.distTransNewAccuQtWeek = distTransNewAccuQtWeek;
+    }
+
+    public BigDecimal getDistTransNewAccuQtWeek()
+    {
+        return distTransNewAccuQtWeek;
+    }
+    public void setLowVoltLineAccuQtWeek(BigDecimal lowVoltLineAccuQtWeek)
+    {
+        this.lowVoltLineAccuQtWeek = lowVoltLineAccuQtWeek;
+    }
+
+    public BigDecimal getLowVoltLineAccuQtWeek()
+    {
+        return lowVoltLineAccuQtWeek;
+    }
+    public void setTowerAccuQtWeek(BigDecimal towerAccuQtWeek)
+    {
+        this.towerAccuQtWeek = towerAccuQtWeek;
+    }
+
+    public BigDecimal getTowerAccuQtWeek()
+    {
+        return towerAccuQtWeek;
+    }
+    public void setRingCabinetAccuQtWeek(BigDecimal ringCabinetAccuQtWeek)
+    {
+        this.ringCabinetAccuQtWeek = ringCabinetAccuQtWeek;
+    }
+
+    public BigDecimal getRingCabinetAccuQtWeek()
+    {
+        return ringCabinetAccuQtWeek;
+    }
+    public void setPoleTabAccuQtWeek(BigDecimal poleTabAccuQtWeek)
+    {
+        this.poleTabAccuQtWeek = poleTabAccuQtWeek;
+    }
+
+    public BigDecimal getPoleTabAccuQtWeek()
+    {
+        return poleTabAccuQtWeek;
+    }
+    public void setLineCableNewAccuQtWork(BigDecimal lineCableNewAccuQtWork)
+    {
+        this.lineCableNewAccuQtWork = lineCableNewAccuQtWork;
+    }
+
+    public BigDecimal getLineCableNewAccuQtWork()
+    {
+        return lineCableNewAccuQtWork;
+    }
+    public void setLineOverhdNewAccuQtWork(BigDecimal lineOverhdNewAccuQtWork)
+    {
+        this.lineOverhdNewAccuQtWork = lineOverhdNewAccuQtWork;
+    }
+
+    public BigDecimal getLineOverhdNewAccuQtWork()
+    {
+        return lineOverhdNewAccuQtWork;
+    }
+    public void setDistTransNewAccuQtWork(BigDecimal distTransNewAccuQtWork)
+    {
+        this.distTransNewAccuQtWork = distTransNewAccuQtWork;
+    }
+
+    public BigDecimal getDistTransNewAccuQtWork()
+    {
+        return distTransNewAccuQtWork;
+    }
+    public void setLowVoltLineAccuQtWork(BigDecimal lowVoltLineAccuQtWork)
+    {
+        this.lowVoltLineAccuQtWork = lowVoltLineAccuQtWork;
+    }
+
+    public BigDecimal getLowVoltLineAccuQtWork()
+    {
+        return lowVoltLineAccuQtWork;
+    }
+    public void setTowerAccuQtWork(BigDecimal towerAccuQtWork)
+    {
+        this.towerAccuQtWork = towerAccuQtWork;
+    }
+
+    public BigDecimal getTowerAccuQtWork()
+    {
+        return towerAccuQtWork;
+    }
+    public void setRingCabinetAccuQtWork(BigDecimal ringCabinetAccuQtWork)
+    {
+        this.ringCabinetAccuQtWork = ringCabinetAccuQtWork;
+    }
+
+    public BigDecimal getRingCabinetAccuQtWork()
+    {
+        return ringCabinetAccuQtWork;
+    }
+    public void setPoleTabAccuQtWork(BigDecimal poleTabAccuQtWork)
+    {
+        this.poleTabAccuQtWork = poleTabAccuQtWork;
+    }
+
+    public BigDecimal getPoleTabAccuQtWork()
+    {
+        return poleTabAccuQtWork;
+    }
+    public void setLineCableNewAccuQtWorkWeek(BigDecimal lineCableNewAccuQtWorkWeek)
+    {
+        this.lineCableNewAccuQtWorkWeek = lineCableNewAccuQtWorkWeek;
+    }
+
+    public BigDecimal getLineCableNewAccuQtWorkWeek()
+    {
+        return lineCableNewAccuQtWorkWeek;
+    }
+    public void setLineOverhdNewAccuQtWorkWeek(BigDecimal lineOverhdNewAccuQtWorkWeek)
+    {
+        this.lineOverhdNewAccuQtWorkWeek = lineOverhdNewAccuQtWorkWeek;
+    }
+
+    public BigDecimal getLineOverhdNewAccuQtWorkWeek()
+    {
+        return lineOverhdNewAccuQtWorkWeek;
+    }
+    public void setDistTransNewAccuQtWorkWeek(BigDecimal distTransNewAccuQtWorkWeek)
+    {
+        this.distTransNewAccuQtWorkWeek = distTransNewAccuQtWorkWeek;
+    }
+
+    public BigDecimal getDistTransNewAccuQtWorkWeek()
+    {
+        return distTransNewAccuQtWorkWeek;
+    }
+    public void setLowVoltLineAccuQtWorkWeek(BigDecimal lowVoltLineAccuQtWorkWeek)
+    {
+        this.lowVoltLineAccuQtWorkWeek = lowVoltLineAccuQtWorkWeek;
+    }
+
+    public BigDecimal getLowVoltLineAccuQtWorkWeek()
+    {
+        return lowVoltLineAccuQtWorkWeek;
+    }
+    public void setTowerAccuQtWorkWeek(BigDecimal towerAccuQtWorkWeek)
+    {
+        this.towerAccuQtWorkWeek = towerAccuQtWorkWeek;
+    }
+
+    public BigDecimal getTowerAccuQtWorkWeek()
+    {
+        return towerAccuQtWorkWeek;
+    }
+    public void setRingCabinetAccuQtWorkWeek(BigDecimal ringCabinetAccuQtWorkWeek)
+    {
+        this.ringCabinetAccuQtWorkWeek = ringCabinetAccuQtWorkWeek;
+    }
+
+    public BigDecimal getRingCabinetAccuQtWorkWeek()
+    {
+        return ringCabinetAccuQtWorkWeek;
+    }
+    public void setPoleTabAccuQtWorkWeek(BigDecimal poleTabAccuQtWorkWeek)
+    {
+        this.poleTabAccuQtWorkWeek = poleTabAccuQtWorkWeek;
+    }
+
+    public BigDecimal getPoleTabAccuQtWorkWeek()
+    {
+        return poleTabAccuQtWorkWeek;
+    }
+    public void setExcType(String excType)
+    {
+        this.excType = excType;
+    }
+
+    public String getExcType()
+    {
+        return excType;
+    }
 
     @Override
     public String toString() {
@@ -495,6 +781,28 @@ public class PdmWorkCompleStatistics extends BaseEntity
             .append("stdCountyOrgNm", getStdCountyOrgNm())
             .append("dataDt", getDataDt())
             .append("etlTm", getEtlTm())
+            .append("lineCableNewAccuQtWeek", getLineCableNewAccuQtWeek())
+            .append("lineOverhdNewAccuQtWeek", getLineOverhdNewAccuQtWeek())
+            .append("distTransNewAccuQtWeek", getDistTransNewAccuQtWeek())
+            .append("lowVoltLineAccuQtWeek", getLowVoltLineAccuQtWeek())
+            .append("towerAccuQtWeek", getTowerAccuQtWeek())
+            .append("ringCabinetAccuQtWeek", getRingCabinetAccuQtWeek())
+            .append("poleTabAccuQtWeek", getPoleTabAccuQtWeek())
+            .append("lineCableNewAccuQtWork", getLineCableNewAccuQtWork())
+            .append("lineOverhdNewAccuQtWork", getLineOverhdNewAccuQtWork())
+            .append("distTransNewAccuQtWork", getDistTransNewAccuQtWork())
+            .append("lowVoltLineAccuQtWork", getLowVoltLineAccuQtWork())
+            .append("towerAccuQtWork", getTowerAccuQtWork())
+            .append("ringCabinetAccuQtWork", getRingCabinetAccuQtWork())
+            .append("poleTabAccuQtWork", getPoleTabAccuQtWork())
+            .append("lineCableNewAccuQtWorkWeek", getLineCableNewAccuQtWorkWeek())
+            .append("lineOverhdNewAccuQtWorkWeek", getLineOverhdNewAccuQtWorkWeek())
+            .append("distTransNewAccuQtWorkWeek", getDistTransNewAccuQtWorkWeek())
+            .append("lowVoltLineAccuQtWorkWeek", getLowVoltLineAccuQtWorkWeek())
+            .append("towerAccuQtWorkWeek", getTowerAccuQtWorkWeek())
+            .append("ringCabinetAccuQtWorkWeek", getRingCabinetAccuQtWorkWeek())
+            .append("poleTabAccuQtWorkWeek", getPoleTabAccuQtWorkWeek())
+            .append("excType", getExcType())
             .toString();
     }
 }

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

@@ -0,0 +1,514 @@
+package com.ruoyi.powerdistribution.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 工程量完成情况临时对象 pdm_work_comple_statistics_tmp
+ *
+ * @author ruoyi
+ * @date 2025-02-11
+ */
+public class PdmWorkCompleStatisticsTmp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 批次工程ID  */
+    @Excel(name = "批次工程ID ")
+    private String batchId;
+
+    /** 批次工程名称 */
+    @Excel(name = "批次工程名称")
+    private String batchName;
+
+    /** 批次工程编号 */
+    @Excel(name = "批次工程编号")
+    private String batchCode;
+
+    /** 计划年度 */
+    @Excel(name = "计划年度")
+    private String planYear;
+
+    /** 工程ID */
+    private String id;
+
+    /** 单项工程编号 */
+    @Excel(name = "单项工程编号")
+    private String proCode;
+
+    /** 单项工程名称 */
+    @Excel(name = "单项工程名称")
+    private String proName;
+
+    /** 排序序号 */
+    @Excel(name = "排序序号")
+    private String sortSerial;
+
+    /** 设计批复村名 */
+    @Excel(name = "设计批复村名")
+    private String smallVillageName;
+
+    /** 合并村名 */
+    @Excel(name = "合并村名")
+    private String villageName;
+
+    /** 竣工标志 1已竣工0未竣工 */
+    @Excel(name = "竣工标志 1已竣工0未竣工")
+    private String completeFlag;
+
+    /** 项目类别：10农网;20城网 */
+    @Excel(name = "项目类别：10农网;20城网")
+    private String proCategory;
+
+    /** 10kV线路电缆计划量 */
+    @Excel(name = "10kV线路电缆计划量")
+    private BigDecimal lineCableNewPlanQt;
+
+    /** 10kV线路电缆累计完成量 */
+    @Excel(name = "10kV线路电缆累计完成量")
+    private BigDecimal lineCableNewAccuQt;
+
+    /** 10kV线路架空计划量 */
+    @Excel(name = "10kV线路架空计划量")
+    private BigDecimal lineOverhdNewPlanQt;
+
+    /** 10kV线路架空累计完成量 */
+    @Excel(name = "10kV线路架空累计完成量")
+    private BigDecimal lineOverhdNewAccuQt;
+
+    /** 配电变压器计划量 */
+    @Excel(name = "配电变压器计划量")
+    private BigDecimal distTransNewPlanQt;
+
+    /** 10kV线路电缆累计完成量 */
+    @Excel(name = "10kV线路电缆累计完成量")
+    private BigDecimal distTransNewAccuQt;
+
+    /** 低压线路计划量 */
+    @Excel(name = "低压线路计划量")
+    private BigDecimal lowVoltLinePlanQt;
+
+    /** 低压线路累计完成量 */
+    @Excel(name = "低压线路累计完成量")
+    private BigDecimal lowVoltLineAccuQt;
+
+    /** 杆塔基计划量 */
+    @Excel(name = "杆塔基计划量")
+    private BigDecimal towerPlanQt;
+
+    /** 杆塔基累计完成量 */
+    @Excel(name = "杆塔基累计完成量")
+    private BigDecimal towerAccuQt;
+
+    /** 环网柜台计划量 */
+    @Excel(name = "环网柜台计划量")
+    private BigDecimal ringCabinetPlanQt;
+
+    /** 环网柜台累计完成量 */
+    @Excel(name = "环网柜台累计完成量")
+    private BigDecimal ringCabinetAccuQt;
+
+    /** 柱上断路器台计划量 */
+    @Excel(name = "柱上断路器台计划量")
+    private BigDecimal poleTabPlanQt;
+
+    /** 柱上断路器台累计完成量 */
+    @Excel(name = "柱上断路器台累计完成量")
+    private BigDecimal poleTabAccuQt;
+
+    /** 标准单位编码  */
+    @Excel(name = "标准单位编码 ")
+    private String stdOrgNo;
+
+    /** 标准单位名称  */
+    @Excel(name = "标准单位名称 ")
+    private String stdOrgNm;
+
+    /** 标准地市单位编码  */
+    @Excel(name = "标准地市单位编码 ")
+    private String stdCityOrgNo;
+
+    /** 标准地市单位名称  */
+    @Excel(name = "标准地市单位名称 ")
+    private String stdCityOrgNm;
+
+    /** 标准区县单位编码  */
+    @Excel(name = "标准区县单位编码 ")
+    private String stdCountyOrgNo;
+
+    /** 标准区县单位名称  */
+    @Excel(name = "标准区县单位名称 ")
+    private String stdCountyOrgNm;
+
+    /** 数据日期  */
+    @Excel(name = "数据日期 ")
+    private String dataDt;
+
+    /** ETL时间戳  */
+    @Excel(name = "ETL时间戳 ")
+    private String etlTm;
+
+    /** 处理状态 0未处理 1已处理 */
+    @Excel(name = "处理状态 0未处理 1已处理")
+    private String dealStatus;
+
+    public void setBatchId(String batchId)
+    {
+        this.batchId = batchId;
+    }
+
+    public String getBatchId()
+    {
+        return batchId;
+    }
+    public void setBatchName(String batchName)
+    {
+        this.batchName = batchName;
+    }
+
+    public String getBatchName()
+    {
+        return batchName;
+    }
+    public void setBatchCode(String batchCode)
+    {
+        this.batchCode = batchCode;
+    }
+
+    public String getBatchCode()
+    {
+        return batchCode;
+    }
+    public void setPlanYear(String planYear)
+    {
+        this.planYear = planYear;
+    }
+
+    public String getPlanYear()
+    {
+        return planYear;
+    }
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setProCode(String proCode)
+    {
+        this.proCode = proCode;
+    }
+
+    public String getProCode()
+    {
+        return proCode;
+    }
+    public void setProName(String proName)
+    {
+        this.proName = proName;
+    }
+
+    public String getProName()
+    {
+        return proName;
+    }
+    public void setSortSerial(String sortSerial)
+    {
+        this.sortSerial = sortSerial;
+    }
+
+    public String getSortSerial()
+    {
+        return sortSerial;
+    }
+    public void setSmallVillageName(String smallVillageName)
+    {
+        this.smallVillageName = smallVillageName;
+    }
+
+    public String getSmallVillageName()
+    {
+        return smallVillageName;
+    }
+    public void setVillageName(String villageName)
+    {
+        this.villageName = villageName;
+    }
+
+    public String getVillageName()
+    {
+        return villageName;
+    }
+    public void setCompleteFlag(String completeFlag)
+    {
+        this.completeFlag = completeFlag;
+    }
+
+    public String getCompleteFlag()
+    {
+        return completeFlag;
+    }
+    public void setProCategory(String proCategory)
+    {
+        this.proCategory = proCategory;
+    }
+
+    public String getProCategory()
+    {
+        return proCategory;
+    }
+    public void setLineCableNewPlanQt(BigDecimal lineCableNewPlanQt)
+    {
+        this.lineCableNewPlanQt = lineCableNewPlanQt;
+    }
+
+    public BigDecimal getLineCableNewPlanQt()
+    {
+        return lineCableNewPlanQt;
+    }
+    public void setLineCableNewAccuQt(BigDecimal lineCableNewAccuQt)
+    {
+        this.lineCableNewAccuQt = lineCableNewAccuQt;
+    }
+
+    public BigDecimal getLineCableNewAccuQt()
+    {
+        return lineCableNewAccuQt;
+    }
+    public void setLineOverhdNewPlanQt(BigDecimal lineOverhdNewPlanQt)
+    {
+        this.lineOverhdNewPlanQt = lineOverhdNewPlanQt;
+    }
+
+    public BigDecimal getLineOverhdNewPlanQt()
+    {
+        return lineOverhdNewPlanQt;
+    }
+    public void setLineOverhdNewAccuQt(BigDecimal lineOverhdNewAccuQt)
+    {
+        this.lineOverhdNewAccuQt = lineOverhdNewAccuQt;
+    }
+
+    public BigDecimal getLineOverhdNewAccuQt()
+    {
+        return lineOverhdNewAccuQt;
+    }
+    public void setDistTransNewPlanQt(BigDecimal distTransNewPlanQt)
+    {
+        this.distTransNewPlanQt = distTransNewPlanQt;
+    }
+
+    public BigDecimal getDistTransNewPlanQt()
+    {
+        return distTransNewPlanQt;
+    }
+    public void setDistTransNewAccuQt(BigDecimal distTransNewAccuQt)
+    {
+        this.distTransNewAccuQt = distTransNewAccuQt;
+    }
+
+    public BigDecimal getDistTransNewAccuQt()
+    {
+        return distTransNewAccuQt;
+    }
+    public void setLowVoltLinePlanQt(BigDecimal lowVoltLinePlanQt)
+    {
+        this.lowVoltLinePlanQt = lowVoltLinePlanQt;
+    }
+
+    public BigDecimal getLowVoltLinePlanQt()
+    {
+        return lowVoltLinePlanQt;
+    }
+    public void setLowVoltLineAccuQt(BigDecimal lowVoltLineAccuQt)
+    {
+        this.lowVoltLineAccuQt = lowVoltLineAccuQt;
+    }
+
+    public BigDecimal getLowVoltLineAccuQt()
+    {
+        return lowVoltLineAccuQt;
+    }
+    public void setTowerPlanQt(BigDecimal towerPlanQt)
+    {
+        this.towerPlanQt = towerPlanQt;
+    }
+
+    public BigDecimal getTowerPlanQt()
+    {
+        return towerPlanQt;
+    }
+    public void setTowerAccuQt(BigDecimal towerAccuQt)
+    {
+        this.towerAccuQt = towerAccuQt;
+    }
+
+    public BigDecimal getTowerAccuQt()
+    {
+        return towerAccuQt;
+    }
+    public void setRingCabinetPlanQt(BigDecimal ringCabinetPlanQt)
+    {
+        this.ringCabinetPlanQt = ringCabinetPlanQt;
+    }
+
+    public BigDecimal getRingCabinetPlanQt()
+    {
+        return ringCabinetPlanQt;
+    }
+    public void setRingCabinetAccuQt(BigDecimal ringCabinetAccuQt)
+    {
+        this.ringCabinetAccuQt = ringCabinetAccuQt;
+    }
+
+    public BigDecimal getRingCabinetAccuQt()
+    {
+        return ringCabinetAccuQt;
+    }
+    public void setPoleTabPlanQt(BigDecimal poleTabPlanQt)
+    {
+        this.poleTabPlanQt = poleTabPlanQt;
+    }
+
+    public BigDecimal getPoleTabPlanQt()
+    {
+        return poleTabPlanQt;
+    }
+    public void setPoleTabAccuQt(BigDecimal poleTabAccuQt)
+    {
+        this.poleTabAccuQt = poleTabAccuQt;
+    }
+
+    public BigDecimal getPoleTabAccuQt()
+    {
+        return poleTabAccuQt;
+    }
+    public void setStdOrgNo(String stdOrgNo)
+    {
+        this.stdOrgNo = stdOrgNo;
+    }
+
+    public String getStdOrgNo()
+    {
+        return stdOrgNo;
+    }
+    public void setStdOrgNm(String stdOrgNm)
+    {
+        this.stdOrgNm = stdOrgNm;
+    }
+
+    public String getStdOrgNm()
+    {
+        return stdOrgNm;
+    }
+    public void setStdCityOrgNo(String stdCityOrgNo)
+    {
+        this.stdCityOrgNo = stdCityOrgNo;
+    }
+
+    public String getStdCityOrgNo()
+    {
+        return stdCityOrgNo;
+    }
+    public void setStdCityOrgNm(String stdCityOrgNm)
+    {
+        this.stdCityOrgNm = stdCityOrgNm;
+    }
+
+    public String getStdCityOrgNm()
+    {
+        return stdCityOrgNm;
+    }
+    public void setStdCountyOrgNo(String stdCountyOrgNo)
+    {
+        this.stdCountyOrgNo = stdCountyOrgNo;
+    }
+
+    public String getStdCountyOrgNo()
+    {
+        return stdCountyOrgNo;
+    }
+    public void setStdCountyOrgNm(String stdCountyOrgNm)
+    {
+        this.stdCountyOrgNm = stdCountyOrgNm;
+    }
+
+    public String getStdCountyOrgNm()
+    {
+        return stdCountyOrgNm;
+    }
+    public void setDataDt(String dataDt)
+    {
+        this.dataDt = dataDt;
+    }
+
+    public String getDataDt()
+    {
+        return dataDt;
+    }
+    public void setEtlTm(String etlTm)
+    {
+        this.etlTm = etlTm;
+    }
+
+    public String getEtlTm()
+    {
+        return etlTm;
+    }
+    public void setDealStatus(String dealStatus)
+    {
+        this.dealStatus = dealStatus;
+    }
+
+    public String getDealStatus()
+    {
+        return dealStatus;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("batchId", getBatchId())
+            .append("batchName", getBatchName())
+            .append("batchCode", getBatchCode())
+            .append("planYear", getPlanYear())
+            .append("id", getId())
+            .append("proCode", getProCode())
+            .append("proName", getProName())
+            .append("sortSerial", getSortSerial())
+            .append("smallVillageName", getSmallVillageName())
+            .append("villageName", getVillageName())
+            .append("completeFlag", getCompleteFlag())
+            .append("proCategory", getProCategory())
+            .append("lineCableNewPlanQt", getLineCableNewPlanQt())
+            .append("lineCableNewAccuQt", getLineCableNewAccuQt())
+            .append("lineOverhdNewPlanQt", getLineOverhdNewPlanQt())
+            .append("lineOverhdNewAccuQt", getLineOverhdNewAccuQt())
+            .append("distTransNewPlanQt", getDistTransNewPlanQt())
+            .append("distTransNewAccuQt", getDistTransNewAccuQt())
+            .append("lowVoltLinePlanQt", getLowVoltLinePlanQt())
+            .append("lowVoltLineAccuQt", getLowVoltLineAccuQt())
+            .append("towerPlanQt", getTowerPlanQt())
+            .append("towerAccuQt", getTowerAccuQt())
+            .append("ringCabinetPlanQt", getRingCabinetPlanQt())
+            .append("ringCabinetAccuQt", getRingCabinetAccuQt())
+            .append("poleTabPlanQt", getPoleTabPlanQt())
+            .append("poleTabAccuQt", getPoleTabAccuQt())
+            .append("stdOrgNo", getStdOrgNo())
+            .append("stdOrgNm", getStdOrgNm())
+            .append("stdCityOrgNo", getStdCityOrgNo())
+            .append("stdCityOrgNm", getStdCityOrgNm())
+            .append("stdCountyOrgNo", getStdCountyOrgNo())
+            .append("stdCountyOrgNm", getStdCountyOrgNm())
+            .append("dataDt", getDataDt())
+            .append("etlTm", getEtlTm())
+            .append("dealStatus", getDealStatus())
+            .toString();
+    }
+}

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/mapper/PdmWorkCompleStatisticsMapper.java

@@ -2,13 +2,12 @@ package com.ruoyi.powerdistribution.mapper;
 
 import java.util.List;
 import com.ruoyi.powerdistribution.domain.PdmWorkCompleStatistics;
-import com.ruoyi.powerdistribution.domain.vo.PdmWorkCompleStatisticsVO;
 
 /**
  * 工程量完成情况Mapper接口
  *
  * @author ruoyi
- * @date 2025-01-22
+ * @date 2025-02-11
  */
 public interface PdmWorkCompleStatisticsMapper
 {
@@ -59,11 +58,4 @@ public interface PdmWorkCompleStatisticsMapper
      * @return 结果
      */
     public int deletePdmWorkCompleStatisticsByIds(String[] ids);
-
-    /**
-     * 工程量统计和作业数据
-     * @param pdmWorkCompleStatistics
-     * @return
-     */
-    List<PdmWorkCompleStatisticsVO> selectPdmWorkCompleStatistics(PdmWorkCompleStatistics pdmWorkCompleStatistics);
 }

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/mapper/PdmWorkCompleStatisticsTmpMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.powerdistribution.mapper;
+
+import java.util.List;
+import com.ruoyi.powerdistribution.domain.PdmWorkCompleStatisticsTmp;
+
+/**
+ * 工程量完成情况临时Mapper接口
+ *
+ * @author ruoyi
+ * @date 2025-02-11
+ */
+public interface PdmWorkCompleStatisticsTmpMapper
+{
+    /**
+     * 查询工程量完成情况临时
+     *
+     * @param id 工程量完成情况临时主键
+     * @return 工程量完成情况临时
+     */
+    public PdmWorkCompleStatisticsTmp selectPdmWorkCompleStatisticsTmpById(String id);
+
+    /**
+     * 查询工程量完成情况临时列表
+     *
+     * @param pdmWorkCompleStatisticsTmp 工程量完成情况临时
+     * @return 工程量完成情况临时集合
+     */
+    public List<PdmWorkCompleStatisticsTmp> selectPdmWorkCompleStatisticsTmpList(PdmWorkCompleStatisticsTmp pdmWorkCompleStatisticsTmp);
+
+    /**
+     * 新增工程量完成情况临时
+     *
+     * @param pdmWorkCompleStatisticsTmp 工程量完成情况临时
+     * @return 结果
+     */
+    public int insertPdmWorkCompleStatisticsTmp(PdmWorkCompleStatisticsTmp pdmWorkCompleStatisticsTmp);
+
+    /**
+     * 修改工程量完成情况临时
+     *
+     * @param pdmWorkCompleStatisticsTmp 工程量完成情况临时
+     * @return 结果
+     */
+    public int updatePdmWorkCompleStatisticsTmp(PdmWorkCompleStatisticsTmp pdmWorkCompleStatisticsTmp);
+
+    /**
+     * 删除工程量完成情况临时
+     *
+     * @param id 工程量完成情况临时主键
+     * @return 结果
+     */
+    public int deletePdmWorkCompleStatisticsTmpById(String id);
+
+    /**
+     * 批量删除工程量完成情况临时
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deletePdmWorkCompleStatisticsTmpByIds(String[] ids);
+}

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/IPdmWorkCompleStatisticsService.java

@@ -2,13 +2,12 @@ package com.ruoyi.powerdistribution.service;
 
 import java.util.List;
 import com.ruoyi.powerdistribution.domain.PdmWorkCompleStatistics;
-import com.ruoyi.powerdistribution.domain.vo.PdmWorkCompleStatisticsVO;
 
 /**
  * 工程量完成情况Service接口
  *
  * @author ruoyi
- * @date 2025-01-22
+ * @date 2025-02-11
  */
 public interface IPdmWorkCompleStatisticsService
 {
@@ -59,11 +58,4 @@ public interface IPdmWorkCompleStatisticsService
      * @return 结果
      */
     public int deletePdmWorkCompleStatisticsById(String id);
-
-    /**
-     * 工程量统计和作业数据
-     * @param pdmWorkCompleStatistics
-     * @return
-     */
-    List<PdmWorkCompleStatisticsVO> selectPdmWorkCompleStatistics(PdmWorkCompleStatistics pdmWorkCompleStatistics);
 }

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/IPdmWorkCompleStatisticsTmpService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.powerdistribution.service;
+
+import java.util.List;
+import com.ruoyi.powerdistribution.domain.PdmWorkCompleStatisticsTmp;
+
+/**
+ * 工程量完成情况临时Service接口
+ *
+ * @author ruoyi
+ * @date 2025-02-11
+ */
+public interface IPdmWorkCompleStatisticsTmpService
+{
+    /**
+     * 查询工程量完成情况临时
+     *
+     * @param id 工程量完成情况临时主键
+     * @return 工程量完成情况临时
+     */
+    public PdmWorkCompleStatisticsTmp selectPdmWorkCompleStatisticsTmpById(String id);
+
+    /**
+     * 查询工程量完成情况临时列表
+     *
+     * @param pdmWorkCompleStatisticsTmp 工程量完成情况临时
+     * @return 工程量完成情况临时集合
+     */
+    public List<PdmWorkCompleStatisticsTmp> selectPdmWorkCompleStatisticsTmpList(PdmWorkCompleStatisticsTmp pdmWorkCompleStatisticsTmp);
+
+    /**
+     * 新增工程量完成情况临时
+     *
+     * @param pdmWorkCompleStatisticsTmp 工程量完成情况临时
+     * @return 结果
+     */
+    public int insertPdmWorkCompleStatisticsTmp(PdmWorkCompleStatisticsTmp pdmWorkCompleStatisticsTmp);
+
+    /**
+     * 修改工程量完成情况临时
+     *
+     * @param pdmWorkCompleStatisticsTmp 工程量完成情况临时
+     * @return 结果
+     */
+    public int updatePdmWorkCompleStatisticsTmp(PdmWorkCompleStatisticsTmp pdmWorkCompleStatisticsTmp);
+
+    /**
+     * 批量删除工程量完成情况临时
+     *
+     * @param ids 需要删除的工程量完成情况临时主键集合
+     * @return 结果
+     */
+    public int deletePdmWorkCompleStatisticsTmpByIds(String[] ids);
+
+    /**
+     * 删除工程量完成情况临时信息
+     *
+     * @param id 工程量完成情况临时主键
+     * @return 结果
+     */
+    public int deletePdmWorkCompleStatisticsTmpById(String id);
+}

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/impl/PdmWorkCompleStatisticsServiceImpl.java

@@ -1,8 +1,6 @@
 package com.ruoyi.powerdistribution.service.impl;
 
 import java.util.List;
-
-import com.ruoyi.powerdistribution.domain.vo.PdmWorkCompleStatisticsVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.powerdistribution.mapper.PdmWorkCompleStatisticsMapper;
@@ -13,7 +11,7 @@ import com.ruoyi.powerdistribution.service.IPdmWorkCompleStatisticsService;
  * 工程量完成情况Service业务层处理
  *
  * @author ruoyi
- * @date 2025-01-22
+ * @date 2025-02-11
  */
 @Service
 public class PdmWorkCompleStatisticsServiceImpl implements IPdmWorkCompleStatisticsService
@@ -92,9 +90,4 @@ public class PdmWorkCompleStatisticsServiceImpl implements IPdmWorkCompleStatist
     {
         return pdmWorkCompleStatisticsMapper.deletePdmWorkCompleStatisticsById(id);
     }
-
-    @Override
-    public List<PdmWorkCompleStatisticsVO> selectPdmWorkCompleStatistics(PdmWorkCompleStatistics pdmWorkCompleStatistics) {
-        return pdmWorkCompleStatisticsMapper.selectPdmWorkCompleStatistics(pdmWorkCompleStatistics);
-    }
 }

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/impl/PdmWorkCompleStatisticsTmpServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.powerdistribution.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.powerdistribution.mapper.PdmWorkCompleStatisticsTmpMapper;
+import com.ruoyi.powerdistribution.domain.PdmWorkCompleStatisticsTmp;
+import com.ruoyi.powerdistribution.service.IPdmWorkCompleStatisticsTmpService;
+
+/**
+ * 工程量完成情况临时Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2025-02-11
+ */
+@Service
+public class PdmWorkCompleStatisticsTmpServiceImpl implements IPdmWorkCompleStatisticsTmpService
+{
+    @Autowired
+    private PdmWorkCompleStatisticsTmpMapper pdmWorkCompleStatisticsTmpMapper;
+
+    /**
+     * 查询工程量完成情况临时
+     *
+     * @param id 工程量完成情况临时主键
+     * @return 工程量完成情况临时
+     */
+    @Override
+    public PdmWorkCompleStatisticsTmp selectPdmWorkCompleStatisticsTmpById(String id)
+    {
+        return pdmWorkCompleStatisticsTmpMapper.selectPdmWorkCompleStatisticsTmpById(id);
+    }
+
+    /**
+     * 查询工程量完成情况临时列表
+     *
+     * @param pdmWorkCompleStatisticsTmp 工程量完成情况临时
+     * @return 工程量完成情况临时
+     */
+    @Override
+    public List<PdmWorkCompleStatisticsTmp> selectPdmWorkCompleStatisticsTmpList(PdmWorkCompleStatisticsTmp pdmWorkCompleStatisticsTmp)
+    {
+        return pdmWorkCompleStatisticsTmpMapper.selectPdmWorkCompleStatisticsTmpList(pdmWorkCompleStatisticsTmp);
+    }
+
+    /**
+     * 新增工程量完成情况临时
+     *
+     * @param pdmWorkCompleStatisticsTmp 工程量完成情况临时
+     * @return 结果
+     */
+    @Override
+    public int insertPdmWorkCompleStatisticsTmp(PdmWorkCompleStatisticsTmp pdmWorkCompleStatisticsTmp)
+    {
+        return pdmWorkCompleStatisticsTmpMapper.insertPdmWorkCompleStatisticsTmp(pdmWorkCompleStatisticsTmp);
+    }
+
+    /**
+     * 修改工程量完成情况临时
+     *
+     * @param pdmWorkCompleStatisticsTmp 工程量完成情况临时
+     * @return 结果
+     */
+    @Override
+    public int updatePdmWorkCompleStatisticsTmp(PdmWorkCompleStatisticsTmp pdmWorkCompleStatisticsTmp)
+    {
+        return pdmWorkCompleStatisticsTmpMapper.updatePdmWorkCompleStatisticsTmp(pdmWorkCompleStatisticsTmp);
+    }
+
+    /**
+     * 批量删除工程量完成情况临时
+     *
+     * @param ids 需要删除的工程量完成情况临时主键
+     * @return 结果
+     */
+    @Override
+    public int deletePdmWorkCompleStatisticsTmpByIds(String[] ids)
+    {
+        return pdmWorkCompleStatisticsTmpMapper.deletePdmWorkCompleStatisticsTmpByIds(ids);
+    }
+
+    /**
+     * 删除工程量完成情况临时信息
+     *
+     * @param id 工程量完成情况临时主键
+     * @return 结果
+     */
+    @Override
+    public int deletePdmWorkCompleStatisticsTmpById(String id)
+    {
+        return pdmWorkCompleStatisticsTmpMapper.deletePdmWorkCompleStatisticsTmpById(id);
+    }
+}

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

@@ -274,8 +274,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="timeFlag != null  and timeFlag == 1 ">
             and EXISTS(select 1 from pdm_par where par_type = 0 and par_code= end_event_typ_cd and par_value &lt; poweroff_duration_tm)
             </if>
-
         </where>
+        order by create_tm desc
     </select>
 
     <select id="selectPdmStopRecordsById" parameterType="Long" resultMap="PdmStopRecordsResult">

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

@@ -39,7 +39,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="stdCountyOrgNm"    column="std_county_org_nm"    />
         <result property="dataDt"    column="data_dt"    />
         <result property="etlTm"    column="etl_tm"    />
-
+        <result property="lineCableNewAccuQtWeek"    column="line_cable_new_accu_qt_week"    />
+        <result property="lineOverhdNewAccuQtWeek"    column="line_overhd_new_accu_qt_week"    />
+        <result property="distTransNewAccuQtWeek"    column="dist_trans_new_accu_qt_week"    />
+        <result property="lowVoltLineAccuQtWeek"    column="low_volt_line_accu_qt_week"    />
+        <result property="towerAccuQtWeek"    column="tower_accu_qt_week"    />
+        <result property="ringCabinetAccuQtWeek"    column="ring_cabinet_accu_qt_week"    />
+        <result property="poleTabAccuQtWeek"    column="pole_tab_accu_qt_week"    />
         <result property="lineCableNewAccuQtWork"    column="line_cable_new_accu_qt_work"    />
         <result property="lineOverhdNewAccuQtWork"    column="line_overhd_new_accu_qt_work"    />
         <result property="distTransNewAccuQtWork"    column="dist_trans_new_accu_qt_work"    />
@@ -47,11 +53,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="towerAccuQtWork"    column="tower_accu_qt_work"    />
         <result property="ringCabinetAccuQtWork"    column="ring_cabinet_accu_qt_work"    />
         <result property="poleTabAccuQtWork"    column="pole_tab_accu_qt_work"    />
-
+        <result property="lineCableNewAccuQtWorkWeek"    column="line_cable_new_accu_qt_work_week"    />
+        <result property="lineOverhdNewAccuQtWorkWeek"    column="line_overhd_new_accu_qt_work_week"    />
+        <result property="distTransNewAccuQtWorkWeek"    column="dist_trans_new_accu_qt_work_week"    />
+        <result property="lowVoltLineAccuQtWorkWeek"    column="low_volt_line_accu_qt_work_week"    />
+        <result property="towerAccuQtWorkWeek"    column="tower_accu_qt_work_week"    />
+        <result property="ringCabinetAccuQtWorkWeek"    column="ring_cabinet_accu_qt_work_week"    />
+        <result property="poleTabAccuQtWorkWeek"    column="pole_tab_accu_qt_work_week"    />
+        <result property="excType"    column="exc_type"    />
     </resultMap>
 
     <sql id="selectPdmWorkCompleStatisticsVo">
-        select batch_id, batch_name, batch_code, plan_year, id, pro_code, pro_name, sort_serial, small_village_name, village_name, complete_flag, pro_category, line_cable_new_plan_qt, line_cable_new_accu_qt, line_overhd_new_plan_qt, line_overhd_new_accu_qt, dist_trans_new_plan_qt, dist_trans_new_accu_qt, low_volt_line_plan_qt, low_volt_line_accu_qt, tower_plan_qt, tower_accu_qt, ring_cabinet_plan_qt, ring_cabinet_accu_qt, pole_tab_plan_qt, pole_tab_accu_qt, std_org_no, std_org_nm, std_city_org_no, std_city_org_nm, std_county_org_no, std_county_org_nm, data_dt, etl_tm from pdm_work_comple_statistics
+        select batch_id, batch_name, batch_code, plan_year, id, pro_code, pro_name, sort_serial, small_village_name, village_name, complete_flag, pro_category, line_cable_new_plan_qt, line_cable_new_accu_qt, line_overhd_new_plan_qt, line_overhd_new_accu_qt, dist_trans_new_plan_qt, dist_trans_new_accu_qt, low_volt_line_plan_qt, low_volt_line_accu_qt, tower_plan_qt, tower_accu_qt, ring_cabinet_plan_qt, ring_cabinet_accu_qt, pole_tab_plan_qt, pole_tab_accu_qt, std_org_no, std_org_nm, std_city_org_no, std_city_org_nm, std_county_org_no, std_county_org_nm, data_dt, etl_tm, line_cable_new_accu_qt_week, line_overhd_new_accu_qt_week, dist_trans_new_accu_qt_week, low_volt_line_accu_qt_week, tower_accu_qt_week, ring_cabinet_accu_qt_week, pole_tab_accu_qt_week, line_cable_new_accu_qt_work, line_overhd_new_accu_qt_work, dist_trans_new_accu_qt_work, low_volt_line_accu_qt_work, tower_accu_qt_work, ring_cabinet_accu_qt_work, pole_tab_accu_qt_work, line_cable_new_accu_qt_work_week, line_overhd_new_accu_qt_work_week, dist_trans_new_accu_qt_work_week, low_volt_line_accu_qt_work_week, tower_accu_qt_work_week, ring_cabinet_accu_qt_work_week, pole_tab_accu_qt_work_week, exc_type from pdm_work_comple_statistics
     </sql>
 
     <select id="selectPdmWorkCompleStatisticsList" parameterType="PdmWorkCompleStatistics" resultMap="PdmWorkCompleStatisticsResult">
@@ -90,72 +103,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stdCountyOrgNm != null  and stdCountyOrgNm != ''"> and std_county_org_nm = #{stdCountyOrgNm}</if>
             <if test="dataDt != null  and dataDt != ''"> and data_dt = #{dataDt}</if>
             <if test="etlTm != null  and etlTm != ''"> and etl_tm = #{etlTm}</if>
-        </where>
-    </select>
-
-
-    <select id="selectPdmWorkCompleStatistics" parameterType="PdmWorkCompleStatistics" resultType="com.ruoyi.powerdistribution.domain.vo.PdmWorkCompleStatisticsVO">
-
-        select batch_id, batch_name, batch_code, plan_year, t1.id, pro_code, pro_name, sort_serial, small_village_name, village_name, complete_flag, pro_category, line_cable_new_plan_qt, line_cable_new_accu_qt, line_overhd_new_plan_qt, line_overhd_new_accu_qt, dist_trans_new_plan_qt, dist_trans_new_accu_qt, low_volt_line_plan_qt, low_volt_line_accu_qt, tower_plan_qt, tower_accu_qt, ring_cabinet_plan_qt, ring_cabinet_accu_qt, pole_tab_plan_qt, pole_tab_accu_qt, std_org_no, std_org_nm, std_city_org_no, std_city_org_nm, std_county_org_no, std_county_org_nm, data_dt, etl_tm,
-        IFNULL(t2.line_cable_new_accu_qt_work,0) line_cable_new_accu_qt_work,
-        IFNULL(t2.line_overhd_new_accu_qt_work,0) line_overhd_new_accu_qt_work,
-        IFNULL(t2.dist_trans_new_accu_qt_work,0) dist_trans_new_accu_qt_work,
-        IFNULL(t2.low_volt_line_accu_qt_work,0) low_volt_line_accu_qt_work,
-        IFNULL(t2.ring_cabinet_accu_qt_work,0) ring_cabinet_accu_qt_work,
-        IFNULL(t2.pole_tab_accu_qt_work,0) pole_tab_accu_qt_work
-        from pdm_work_comple_statistics t1
-        LEFT JOIN (
-        select proj_id,
-        sum(if(volt_lvl_cd = '2001008' and ((op_content like '%新建%' and op_content like '%电缆%') or (op_content like '%更换%' and op_content like '%电缆%')or (op_content like '%拆除%' and op_content like '%电缆%')),1,0)) line_cable_new_accu_qt_work,
-        sum(if(volt_lvl_cd = '2001008' and ((op_content like '%新建%' and op_content like '%导线%') or (op_content like '%更换%' and op_content like '%导线%')or (op_content like '%拆除%' and op_content like '%导线%')),1,0)) line_overhd_new_accu_qt_work,
-        sum(if(volt_lvl_cd = '2001008' and ((op_content like '%更换%' and op_content like '%变压器%') or (op_content like '%更换%' and op_content like '%变压器%')or (op_content like '%拆除%' and op_content like '%变压器%')),1,0)) dist_trans_new_accu_qt_work,
-        sum(if(volt_lvl_cd = '2001009' and ((op_content like '%新建%' and op_content like '%电缆%') or (op_content like '%更换%' and op_content like '%电缆%')or (op_content like '%拆除%' and op_content like '%电缆%')),1,0)) low_volt_line_accu_qt_work,
-        sum(if((op_content like '%新建%' and op_content like '%环网%') or (op_content like '%更换%' and op_content like '%环网%')or (op_content like '%拆除%' and op_content like '%环网%'),1,0)) ring_cabinet_accu_qt_work,
-        sum(if(volt_lvl_cd = '2001008' and
-        ((op_content like '%新建%' and op_content like '%断路器%') or (op_content like '%更换%' and op_content like '%断路器%') or (op_content like '%拆除%' and op_content like '%断路器%')
-        or (op_content like '%新建%' and op_content like '%开关%') or (op_content like '%更换%' and op_content like '%开关%') or (op_content like '%拆除%' and op_content like '%开关%')
-        or(op_content like '%新建%' and op_content like '%刀闸%') or (op_content like '%更换%' and op_content like '%刀闸%') or (op_content like '%拆除%' and op_content like '%刀闸%')
-        or (op_content like '%新建%' and op_content like '%避雷器%') or (op_content like '%更换%' and op_content like '%避雷器%') or (op_content like '%拆除%' and op_content like '%避雷器%')
-        ),1,0)) pole_tab_accu_qt_work
-        FROM pdm_work_plan
-        GROUP BY proj_id
-        ) t2 on t1.id = t2.proj_id
-
-        <where>
-            <if test="batchId != null  and batchId != ''"> and batch_id = #{batchId}</if>
-            <if test="batchName != null  and batchName != ''"> and batch_name like concat('%', #{batchName}, '%')</if>
-            <if test="batchCode != null  and batchCode != ''"> and batch_code = #{batchCode}</if>
-            <if test="planYear != null  and planYear != ''"> and plan_year = #{planYear}</if>
-            <if test="proCode != null  and proCode != ''"> and pro_code = #{proCode}</if>
-            <if test="proName != null  and proName != ''"> and pro_name like concat('%', #{proName}, '%')</if>
-            <if test="sortSerial != null  and sortSerial != ''"> and sort_serial = #{sortSerial}</if>
-            <if test="smallVillageName != null  and smallVillageName != ''"> and small_village_name like concat('%', #{smallVillageName}, '%')</if>
-            <if test="villageName != null  and villageName != ''"> and village_name like concat('%', #{villageName}, '%')</if>
-            <if test="completeFlag != null  and completeFlag != ''"> and complete_flag = #{completeFlag}</if>
-            <if test="proCategory != null  and proCategory != ''"> and pro_category = #{proCategory}</if>
-            <if test="lineCableNewPlanQt != null "> and line_cable_new_plan_qt = #{lineCableNewPlanQt}</if>
-            <if test="lineCableNewAccuQt != null "> and line_cable_new_accu_qt = #{lineCableNewAccuQt}</if>
-            <if test="lineOverhdNewPlanQt != null "> and line_overhd_new_plan_qt = #{lineOverhdNewPlanQt}</if>
-            <if test="lineOverhdNewAccuQt != null "> and line_overhd_new_accu_qt = #{lineOverhdNewAccuQt}</if>
-            <if test="distTransNewPlanQt != null "> and dist_trans_new_plan_qt = #{distTransNewPlanQt}</if>
-            <if test="distTransNewAccuQt != null "> and dist_trans_new_accu_qt = #{distTransNewAccuQt}</if>
-            <if test="lowVoltLinePlanQt != null "> and low_volt_line_plan_qt = #{lowVoltLinePlanQt}</if>
-            <if test="lowVoltLineAccuQt != null "> and low_volt_line_accu_qt = #{lowVoltLineAccuQt}</if>
-            <if test="towerPlanQt != null "> and tower_plan_qt = #{towerPlanQt}</if>
-            <if test="towerAccuQt != null "> and tower_accu_qt = #{towerAccuQt}</if>
-            <if test="ringCabinetPlanQt != null "> and ring_cabinet_plan_qt = #{ringCabinetPlanQt}</if>
-            <if test="ringCabinetAccuQt != null "> and ring_cabinet_accu_qt = #{ringCabinetAccuQt}</if>
-            <if test="poleTabPlanQt != null "> and pole_tab_plan_qt = #{poleTabPlanQt}</if>
-            <if test="poleTabAccuQt != null "> and pole_tab_accu_qt = #{poleTabAccuQt}</if>
-            <if test="stdOrgNo != null  and stdOrgNo != ''"> and std_org_no = #{stdOrgNo}</if>
-            <if test="stdOrgNm != null  and stdOrgNm != ''"> and std_org_nm = #{stdOrgNm}</if>
-            <if test="stdCityOrgNo != null  and stdCityOrgNo != ''"> and std_city_org_no = #{stdCityOrgNo}</if>
-            <if test="stdCityOrgNm != null  and stdCityOrgNm != ''"> and std_city_org_nm = #{stdCityOrgNm}</if>
-            <if test="stdCountyOrgNo != null  and stdCountyOrgNo != ''"> and std_county_org_no = #{stdCountyOrgNo}</if>
-            <if test="stdCountyOrgNm != null  and stdCountyOrgNm != ''"> and std_county_org_nm = #{stdCountyOrgNm}</if>
-            <if test="dataDt != null  and dataDt != ''"> and data_dt = #{dataDt}</if>
-            <if test="etlTm != null  and etlTm != ''"> and etl_tm = #{etlTm}</if>
-           order by batch_id,sort_serial
+            <if test="lineCableNewAccuQtWeek != null "> and line_cable_new_accu_qt_week = #{lineCableNewAccuQtWeek}</if>
+            <if test="lineOverhdNewAccuQtWeek != null "> and line_overhd_new_accu_qt_week = #{lineOverhdNewAccuQtWeek}</if>
+            <if test="distTransNewAccuQtWeek != null "> and dist_trans_new_accu_qt_week = #{distTransNewAccuQtWeek}</if>
+            <if test="lowVoltLineAccuQtWeek != null "> and low_volt_line_accu_qt_week = #{lowVoltLineAccuQtWeek}</if>
+            <if test="towerAccuQtWeek != null "> and tower_accu_qt_week = #{towerAccuQtWeek}</if>
+            <if test="ringCabinetAccuQtWeek != null "> and ring_cabinet_accu_qt_week = #{ringCabinetAccuQtWeek}</if>
+            <if test="poleTabAccuQtWeek != null "> and pole_tab_accu_qt_week = #{poleTabAccuQtWeek}</if>
+            <if test="lineCableNewAccuQtWork != null "> and line_cable_new_accu_qt_work = #{lineCableNewAccuQtWork}</if>
+            <if test="lineOverhdNewAccuQtWork != null "> and line_overhd_new_accu_qt_work = #{lineOverhdNewAccuQtWork}</if>
+            <if test="distTransNewAccuQtWork != null "> and dist_trans_new_accu_qt_work = #{distTransNewAccuQtWork}</if>
+            <if test="lowVoltLineAccuQtWork != null "> and low_volt_line_accu_qt_work = #{lowVoltLineAccuQtWork}</if>
+            <if test="towerAccuQtWork != null "> and tower_accu_qt_work = #{towerAccuQtWork}</if>
+            <if test="ringCabinetAccuQtWork != null "> and ring_cabinet_accu_qt_work = #{ringCabinetAccuQtWork}</if>
+            <if test="poleTabAccuQtWork != null "> and pole_tab_accu_qt_work = #{poleTabAccuQtWork}</if>
+            <if test="lineCableNewAccuQtWorkWeek != null "> and line_cable_new_accu_qt_work_week = #{lineCableNewAccuQtWorkWeek}</if>
+            <if test="lineOverhdNewAccuQtWorkWeek != null "> and line_overhd_new_accu_qt_work_week = #{lineOverhdNewAccuQtWorkWeek}</if>
+            <if test="distTransNewAccuQtWorkWeek != null "> and dist_trans_new_accu_qt_work_week = #{distTransNewAccuQtWorkWeek}</if>
+            <if test="lowVoltLineAccuQtWorkWeek != null "> and low_volt_line_accu_qt_work_week = #{lowVoltLineAccuQtWorkWeek}</if>
+            <if test="towerAccuQtWorkWeek != null "> and tower_accu_qt_work_week = #{towerAccuQtWorkWeek}</if>
+            <if test="ringCabinetAccuQtWorkWeek != null "> and ring_cabinet_accu_qt_work_week = #{ringCabinetAccuQtWorkWeek}</if>
+            <if test="poleTabAccuQtWorkWeek != null "> and pole_tab_accu_qt_work_week = #{poleTabAccuQtWorkWeek}</if>
+            <if test="excType != null  and excType != ''"> and exc_type = #{excType}</if>
         </where>
     </select>
 
@@ -201,6 +170,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stdCountyOrgNm != null">std_county_org_nm,</if>
             <if test="dataDt != null">data_dt,</if>
             <if test="etlTm != null">etl_tm,</if>
+            <if test="lineCableNewAccuQtWeek != null">line_cable_new_accu_qt_week,</if>
+            <if test="lineOverhdNewAccuQtWeek != null">line_overhd_new_accu_qt_week,</if>
+            <if test="distTransNewAccuQtWeek != null">dist_trans_new_accu_qt_week,</if>
+            <if test="lowVoltLineAccuQtWeek != null">low_volt_line_accu_qt_week,</if>
+            <if test="towerAccuQtWeek != null">tower_accu_qt_week,</if>
+            <if test="ringCabinetAccuQtWeek != null">ring_cabinet_accu_qt_week,</if>
+            <if test="poleTabAccuQtWeek != null">pole_tab_accu_qt_week,</if>
+            <if test="lineCableNewAccuQtWork != null">line_cable_new_accu_qt_work,</if>
+            <if test="lineOverhdNewAccuQtWork != null">line_overhd_new_accu_qt_work,</if>
+            <if test="distTransNewAccuQtWork != null">dist_trans_new_accu_qt_work,</if>
+            <if test="lowVoltLineAccuQtWork != null">low_volt_line_accu_qt_work,</if>
+            <if test="towerAccuQtWork != null">tower_accu_qt_work,</if>
+            <if test="ringCabinetAccuQtWork != null">ring_cabinet_accu_qt_work,</if>
+            <if test="poleTabAccuQtWork != null">pole_tab_accu_qt_work,</if>
+            <if test="lineCableNewAccuQtWorkWeek != null">line_cable_new_accu_qt_work_week,</if>
+            <if test="lineOverhdNewAccuQtWorkWeek != null">line_overhd_new_accu_qt_work_week,</if>
+            <if test="distTransNewAccuQtWorkWeek != null">dist_trans_new_accu_qt_work_week,</if>
+            <if test="lowVoltLineAccuQtWorkWeek != null">low_volt_line_accu_qt_work_week,</if>
+            <if test="towerAccuQtWorkWeek != null">tower_accu_qt_work_week,</if>
+            <if test="ringCabinetAccuQtWorkWeek != null">ring_cabinet_accu_qt_work_week,</if>
+            <if test="poleTabAccuQtWorkWeek != null">pole_tab_accu_qt_work_week,</if>
+            <if test="excType != null">exc_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="batchId != null">#{batchId},</if>
@@ -237,6 +228,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stdCountyOrgNm != null">#{stdCountyOrgNm},</if>
             <if test="dataDt != null">#{dataDt},</if>
             <if test="etlTm != null">#{etlTm},</if>
+            <if test="lineCableNewAccuQtWeek != null">#{lineCableNewAccuQtWeek},</if>
+            <if test="lineOverhdNewAccuQtWeek != null">#{lineOverhdNewAccuQtWeek},</if>
+            <if test="distTransNewAccuQtWeek != null">#{distTransNewAccuQtWeek},</if>
+            <if test="lowVoltLineAccuQtWeek != null">#{lowVoltLineAccuQtWeek},</if>
+            <if test="towerAccuQtWeek != null">#{towerAccuQtWeek},</if>
+            <if test="ringCabinetAccuQtWeek != null">#{ringCabinetAccuQtWeek},</if>
+            <if test="poleTabAccuQtWeek != null">#{poleTabAccuQtWeek},</if>
+            <if test="lineCableNewAccuQtWork != null">#{lineCableNewAccuQtWork},</if>
+            <if test="lineOverhdNewAccuQtWork != null">#{lineOverhdNewAccuQtWork},</if>
+            <if test="distTransNewAccuQtWork != null">#{distTransNewAccuQtWork},</if>
+            <if test="lowVoltLineAccuQtWork != null">#{lowVoltLineAccuQtWork},</if>
+            <if test="towerAccuQtWork != null">#{towerAccuQtWork},</if>
+            <if test="ringCabinetAccuQtWork != null">#{ringCabinetAccuQtWork},</if>
+            <if test="poleTabAccuQtWork != null">#{poleTabAccuQtWork},</if>
+            <if test="lineCableNewAccuQtWorkWeek != null">#{lineCableNewAccuQtWorkWeek},</if>
+            <if test="lineOverhdNewAccuQtWorkWeek != null">#{lineOverhdNewAccuQtWorkWeek},</if>
+            <if test="distTransNewAccuQtWorkWeek != null">#{distTransNewAccuQtWorkWeek},</if>
+            <if test="lowVoltLineAccuQtWorkWeek != null">#{lowVoltLineAccuQtWorkWeek},</if>
+            <if test="towerAccuQtWorkWeek != null">#{towerAccuQtWorkWeek},</if>
+            <if test="ringCabinetAccuQtWorkWeek != null">#{ringCabinetAccuQtWorkWeek},</if>
+            <if test="poleTabAccuQtWorkWeek != null">#{poleTabAccuQtWorkWeek},</if>
+            <if test="excType != null">#{excType},</if>
          </trim>
     </insert>
 
@@ -276,6 +289,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stdCountyOrgNm != null">std_county_org_nm = #{stdCountyOrgNm},</if>
             <if test="dataDt != null">data_dt = #{dataDt},</if>
             <if test="etlTm != null">etl_tm = #{etlTm},</if>
+            <if test="lineCableNewAccuQtWeek != null">line_cable_new_accu_qt_week = #{lineCableNewAccuQtWeek},</if>
+            <if test="lineOverhdNewAccuQtWeek != null">line_overhd_new_accu_qt_week = #{lineOverhdNewAccuQtWeek},</if>
+            <if test="distTransNewAccuQtWeek != null">dist_trans_new_accu_qt_week = #{distTransNewAccuQtWeek},</if>
+            <if test="lowVoltLineAccuQtWeek != null">low_volt_line_accu_qt_week = #{lowVoltLineAccuQtWeek},</if>
+            <if test="towerAccuQtWeek != null">tower_accu_qt_week = #{towerAccuQtWeek},</if>
+            <if test="ringCabinetAccuQtWeek != null">ring_cabinet_accu_qt_week = #{ringCabinetAccuQtWeek},</if>
+            <if test="poleTabAccuQtWeek != null">pole_tab_accu_qt_week = #{poleTabAccuQtWeek},</if>
+            <if test="lineCableNewAccuQtWork != null">line_cable_new_accu_qt_work = #{lineCableNewAccuQtWork},</if>
+            <if test="lineOverhdNewAccuQtWork != null">line_overhd_new_accu_qt_work = #{lineOverhdNewAccuQtWork},</if>
+            <if test="distTransNewAccuQtWork != null">dist_trans_new_accu_qt_work = #{distTransNewAccuQtWork},</if>
+            <if test="lowVoltLineAccuQtWork != null">low_volt_line_accu_qt_work = #{lowVoltLineAccuQtWork},</if>
+            <if test="towerAccuQtWork != null">tower_accu_qt_work = #{towerAccuQtWork},</if>
+            <if test="ringCabinetAccuQtWork != null">ring_cabinet_accu_qt_work = #{ringCabinetAccuQtWork},</if>
+            <if test="poleTabAccuQtWork != null">pole_tab_accu_qt_work = #{poleTabAccuQtWork},</if>
+            <if test="lineCableNewAccuQtWorkWeek != null">line_cable_new_accu_qt_work_week = #{lineCableNewAccuQtWorkWeek},</if>
+            <if test="lineOverhdNewAccuQtWorkWeek != null">line_overhd_new_accu_qt_work_week = #{lineOverhdNewAccuQtWorkWeek},</if>
+            <if test="distTransNewAccuQtWorkWeek != null">dist_trans_new_accu_qt_work_week = #{distTransNewAccuQtWorkWeek},</if>
+            <if test="lowVoltLineAccuQtWorkWeek != null">low_volt_line_accu_qt_work_week = #{lowVoltLineAccuQtWorkWeek},</if>
+            <if test="towerAccuQtWorkWeek != null">tower_accu_qt_work_week = #{towerAccuQtWorkWeek},</if>
+            <if test="ringCabinetAccuQtWorkWeek != null">ring_cabinet_accu_qt_work_week = #{ringCabinetAccuQtWorkWeek},</if>
+            <if test="poleTabAccuQtWorkWeek != null">pole_tab_accu_qt_work_week = #{poleTabAccuQtWorkWeek},</if>
+            <if test="excType != null">exc_type = #{excType},</if>
         </trim>
         where id = #{id}
     </update>
@@ -290,5 +325,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-
 </mapper>

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

@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.powerdistribution.mapper.PdmWorkCompleStatisticsTmpMapper">
+
+    <resultMap type="PdmWorkCompleStatisticsTmp" id="PdmWorkCompleStatisticsTmpResult">
+        <result property="batchId"    column="batch_id"    />
+        <result property="batchName"    column="batch_name"    />
+        <result property="batchCode"    column="batch_code"    />
+        <result property="planYear"    column="plan_year"    />
+        <result property="id"    column="id"    />
+        <result property="proCode"    column="pro_code"    />
+        <result property="proName"    column="pro_name"    />
+        <result property="sortSerial"    column="sort_serial"    />
+        <result property="smallVillageName"    column="small_village_name"    />
+        <result property="villageName"    column="village_name"    />
+        <result property="completeFlag"    column="complete_flag"    />
+        <result property="proCategory"    column="pro_category"    />
+        <result property="lineCableNewPlanQt"    column="line_cable_new_plan_qt"    />
+        <result property="lineCableNewAccuQt"    column="line_cable_new_accu_qt"    />
+        <result property="lineOverhdNewPlanQt"    column="line_overhd_new_plan_qt"    />
+        <result property="lineOverhdNewAccuQt"    column="line_overhd_new_accu_qt"    />
+        <result property="distTransNewPlanQt"    column="dist_trans_new_plan_qt"    />
+        <result property="distTransNewAccuQt"    column="dist_trans_new_accu_qt"    />
+        <result property="lowVoltLinePlanQt"    column="low_volt_line_plan_qt"    />
+        <result property="lowVoltLineAccuQt"    column="low_volt_line_accu_qt"    />
+        <result property="towerPlanQt"    column="tower_plan_qt"    />
+        <result property="towerAccuQt"    column="tower_accu_qt"    />
+        <result property="ringCabinetPlanQt"    column="ring_cabinet_plan_qt"    />
+        <result property="ringCabinetAccuQt"    column="ring_cabinet_accu_qt"    />
+        <result property="poleTabPlanQt"    column="pole_tab_plan_qt"    />
+        <result property="poleTabAccuQt"    column="pole_tab_accu_qt"    />
+        <result property="stdOrgNo"    column="std_org_no"    />
+        <result property="stdOrgNm"    column="std_org_nm"    />
+        <result property="stdCityOrgNo"    column="std_city_org_no"    />
+        <result property="stdCityOrgNm"    column="std_city_org_nm"    />
+        <result property="stdCountyOrgNo"    column="std_county_org_no"    />
+        <result property="stdCountyOrgNm"    column="std_county_org_nm"    />
+        <result property="dataDt"    column="data_dt"    />
+        <result property="etlTm"    column="etl_tm"    />
+        <result property="dealStatus"    column="deal_status"    />
+    </resultMap>
+
+    <sql id="selectPdmWorkCompleStatisticsTmpVo">
+        select batch_id, batch_name, batch_code, plan_year, id, pro_code, pro_name, sort_serial, small_village_name, village_name, complete_flag, pro_category, line_cable_new_plan_qt, line_cable_new_accu_qt, line_overhd_new_plan_qt, line_overhd_new_accu_qt, dist_trans_new_plan_qt, dist_trans_new_accu_qt, low_volt_line_plan_qt, low_volt_line_accu_qt, tower_plan_qt, tower_accu_qt, ring_cabinet_plan_qt, ring_cabinet_accu_qt, pole_tab_plan_qt, pole_tab_accu_qt, std_org_no, std_org_nm, std_city_org_no, std_city_org_nm, std_county_org_no, std_county_org_nm, data_dt, etl_tm, deal_status from pdm_work_comple_statistics_tmp
+    </sql>
+
+    <select id="selectPdmWorkCompleStatisticsTmpList" parameterType="PdmWorkCompleStatisticsTmp" resultMap="PdmWorkCompleStatisticsTmpResult">
+        <include refid="selectPdmWorkCompleStatisticsTmpVo"/>
+        <where>
+            <if test="batchId != null  and batchId != ''"> and batch_id = #{batchId}</if>
+            <if test="batchName != null  and batchName != ''"> and batch_name like concat('%', #{batchName}, '%')</if>
+            <if test="batchCode != null  and batchCode != ''"> and batch_code = #{batchCode}</if>
+            <if test="planYear != null  and planYear != ''"> and plan_year = #{planYear}</if>
+            <if test="proCode != null  and proCode != ''"> and pro_code = #{proCode}</if>
+            <if test="proName != null  and proName != ''"> and pro_name like concat('%', #{proName}, '%')</if>
+            <if test="sortSerial != null  and sortSerial != ''"> and sort_serial = #{sortSerial}</if>
+            <if test="smallVillageName != null  and smallVillageName != ''"> and small_village_name like concat('%', #{smallVillageName}, '%')</if>
+            <if test="villageName != null  and villageName != ''"> and village_name like concat('%', #{villageName}, '%')</if>
+            <if test="completeFlag != null  and completeFlag != ''"> and complete_flag = #{completeFlag}</if>
+            <if test="proCategory != null  and proCategory != ''"> and pro_category = #{proCategory}</if>
+            <if test="lineCableNewPlanQt != null "> and line_cable_new_plan_qt = #{lineCableNewPlanQt}</if>
+            <if test="lineCableNewAccuQt != null "> and line_cable_new_accu_qt = #{lineCableNewAccuQt}</if>
+            <if test="lineOverhdNewPlanQt != null "> and line_overhd_new_plan_qt = #{lineOverhdNewPlanQt}</if>
+            <if test="lineOverhdNewAccuQt != null "> and line_overhd_new_accu_qt = #{lineOverhdNewAccuQt}</if>
+            <if test="distTransNewPlanQt != null "> and dist_trans_new_plan_qt = #{distTransNewPlanQt}</if>
+            <if test="distTransNewAccuQt != null "> and dist_trans_new_accu_qt = #{distTransNewAccuQt}</if>
+            <if test="lowVoltLinePlanQt != null "> and low_volt_line_plan_qt = #{lowVoltLinePlanQt}</if>
+            <if test="lowVoltLineAccuQt != null "> and low_volt_line_accu_qt = #{lowVoltLineAccuQt}</if>
+            <if test="towerPlanQt != null "> and tower_plan_qt = #{towerPlanQt}</if>
+            <if test="towerAccuQt != null "> and tower_accu_qt = #{towerAccuQt}</if>
+            <if test="ringCabinetPlanQt != null "> and ring_cabinet_plan_qt = #{ringCabinetPlanQt}</if>
+            <if test="ringCabinetAccuQt != null "> and ring_cabinet_accu_qt = #{ringCabinetAccuQt}</if>
+            <if test="poleTabPlanQt != null "> and pole_tab_plan_qt = #{poleTabPlanQt}</if>
+            <if test="poleTabAccuQt != null "> and pole_tab_accu_qt = #{poleTabAccuQt}</if>
+            <if test="stdOrgNo != null  and stdOrgNo != ''"> and std_org_no = #{stdOrgNo}</if>
+            <if test="stdOrgNm != null  and stdOrgNm != ''"> and std_org_nm = #{stdOrgNm}</if>
+            <if test="stdCityOrgNo != null  and stdCityOrgNo != ''"> and std_city_org_no = #{stdCityOrgNo}</if>
+            <if test="stdCityOrgNm != null  and stdCityOrgNm != ''"> and std_city_org_nm = #{stdCityOrgNm}</if>
+            <if test="stdCountyOrgNo != null  and stdCountyOrgNo != ''"> and std_county_org_no = #{stdCountyOrgNo}</if>
+            <if test="stdCountyOrgNm != null  and stdCountyOrgNm != ''"> and std_county_org_nm = #{stdCountyOrgNm}</if>
+            <if test="dataDt != null  and dataDt != ''"> and data_dt = #{dataDt}</if>
+            <if test="etlTm != null  and etlTm != ''"> and etl_tm = #{etlTm}</if>
+            <if test="dealStatus != null  and dealStatus != ''"> and deal_status = #{dealStatus}</if>
+        </where>
+    </select>
+
+    <select id="selectPdmWorkCompleStatisticsTmpById" parameterType="String" resultMap="PdmWorkCompleStatisticsTmpResult">
+        <include refid="selectPdmWorkCompleStatisticsTmpVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertPdmWorkCompleStatisticsTmp" parameterType="PdmWorkCompleStatisticsTmp">
+        insert into pdm_work_comple_statistics_tmp
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="batchId != null">batch_id,</if>
+            <if test="batchName != null">batch_name,</if>
+            <if test="batchCode != null">batch_code,</if>
+            <if test="planYear != null">plan_year,</if>
+            <if test="id != null">id,</if>
+            <if test="proCode != null">pro_code,</if>
+            <if test="proName != null">pro_name,</if>
+            <if test="sortSerial != null">sort_serial,</if>
+            <if test="smallVillageName != null">small_village_name,</if>
+            <if test="villageName != null">village_name,</if>
+            <if test="completeFlag != null">complete_flag,</if>
+            <if test="proCategory != null">pro_category,</if>
+            <if test="lineCableNewPlanQt != null">line_cable_new_plan_qt,</if>
+            <if test="lineCableNewAccuQt != null">line_cable_new_accu_qt,</if>
+            <if test="lineOverhdNewPlanQt != null">line_overhd_new_plan_qt,</if>
+            <if test="lineOverhdNewAccuQt != null">line_overhd_new_accu_qt,</if>
+            <if test="distTransNewPlanQt != null">dist_trans_new_plan_qt,</if>
+            <if test="distTransNewAccuQt != null">dist_trans_new_accu_qt,</if>
+            <if test="lowVoltLinePlanQt != null">low_volt_line_plan_qt,</if>
+            <if test="lowVoltLineAccuQt != null">low_volt_line_accu_qt,</if>
+            <if test="towerPlanQt != null">tower_plan_qt,</if>
+            <if test="towerAccuQt != null">tower_accu_qt,</if>
+            <if test="ringCabinetPlanQt != null">ring_cabinet_plan_qt,</if>
+            <if test="ringCabinetAccuQt != null">ring_cabinet_accu_qt,</if>
+            <if test="poleTabPlanQt != null">pole_tab_plan_qt,</if>
+            <if test="poleTabAccuQt != null">pole_tab_accu_qt,</if>
+            <if test="stdOrgNo != null">std_org_no,</if>
+            <if test="stdOrgNm != null">std_org_nm,</if>
+            <if test="stdCityOrgNo != null">std_city_org_no,</if>
+            <if test="stdCityOrgNm != null">std_city_org_nm,</if>
+            <if test="stdCountyOrgNo != null">std_county_org_no,</if>
+            <if test="stdCountyOrgNm != null">std_county_org_nm,</if>
+            <if test="dataDt != null">data_dt,</if>
+            <if test="etlTm != null">etl_tm,</if>
+            <if test="dealStatus != null">deal_status,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="batchId != null">#{batchId},</if>
+            <if test="batchName != null">#{batchName},</if>
+            <if test="batchCode != null">#{batchCode},</if>
+            <if test="planYear != null">#{planYear},</if>
+            <if test="id != null">#{id},</if>
+            <if test="proCode != null">#{proCode},</if>
+            <if test="proName != null">#{proName},</if>
+            <if test="sortSerial != null">#{sortSerial},</if>
+            <if test="smallVillageName != null">#{smallVillageName},</if>
+            <if test="villageName != null">#{villageName},</if>
+            <if test="completeFlag != null">#{completeFlag},</if>
+            <if test="proCategory != null">#{proCategory},</if>
+            <if test="lineCableNewPlanQt != null">#{lineCableNewPlanQt},</if>
+            <if test="lineCableNewAccuQt != null">#{lineCableNewAccuQt},</if>
+            <if test="lineOverhdNewPlanQt != null">#{lineOverhdNewPlanQt},</if>
+            <if test="lineOverhdNewAccuQt != null">#{lineOverhdNewAccuQt},</if>
+            <if test="distTransNewPlanQt != null">#{distTransNewPlanQt},</if>
+            <if test="distTransNewAccuQt != null">#{distTransNewAccuQt},</if>
+            <if test="lowVoltLinePlanQt != null">#{lowVoltLinePlanQt},</if>
+            <if test="lowVoltLineAccuQt != null">#{lowVoltLineAccuQt},</if>
+            <if test="towerPlanQt != null">#{towerPlanQt},</if>
+            <if test="towerAccuQt != null">#{towerAccuQt},</if>
+            <if test="ringCabinetPlanQt != null">#{ringCabinetPlanQt},</if>
+            <if test="ringCabinetAccuQt != null">#{ringCabinetAccuQt},</if>
+            <if test="poleTabPlanQt != null">#{poleTabPlanQt},</if>
+            <if test="poleTabAccuQt != null">#{poleTabAccuQt},</if>
+            <if test="stdOrgNo != null">#{stdOrgNo},</if>
+            <if test="stdOrgNm != null">#{stdOrgNm},</if>
+            <if test="stdCityOrgNo != null">#{stdCityOrgNo},</if>
+            <if test="stdCityOrgNm != null">#{stdCityOrgNm},</if>
+            <if test="stdCountyOrgNo != null">#{stdCountyOrgNo},</if>
+            <if test="stdCountyOrgNm != null">#{stdCountyOrgNm},</if>
+            <if test="dataDt != null">#{dataDt},</if>
+            <if test="etlTm != null">#{etlTm},</if>
+            <if test="dealStatus != null">#{dealStatus},</if>
+         </trim>
+    </insert>
+
+    <update id="updatePdmWorkCompleStatisticsTmp" parameterType="PdmWorkCompleStatisticsTmp">
+        update pdm_work_comple_statistics_tmp
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="batchId != null">batch_id = #{batchId},</if>
+            <if test="batchName != null">batch_name = #{batchName},</if>
+            <if test="batchCode != null">batch_code = #{batchCode},</if>
+            <if test="planYear != null">plan_year = #{planYear},</if>
+            <if test="proCode != null">pro_code = #{proCode},</if>
+            <if test="proName != null">pro_name = #{proName},</if>
+            <if test="sortSerial != null">sort_serial = #{sortSerial},</if>
+            <if test="smallVillageName != null">small_village_name = #{smallVillageName},</if>
+            <if test="villageName != null">village_name = #{villageName},</if>
+            <if test="completeFlag != null">complete_flag = #{completeFlag},</if>
+            <if test="proCategory != null">pro_category = #{proCategory},</if>
+            <if test="lineCableNewPlanQt != null">line_cable_new_plan_qt = #{lineCableNewPlanQt},</if>
+            <if test="lineCableNewAccuQt != null">line_cable_new_accu_qt = #{lineCableNewAccuQt},</if>
+            <if test="lineOverhdNewPlanQt != null">line_overhd_new_plan_qt = #{lineOverhdNewPlanQt},</if>
+            <if test="lineOverhdNewAccuQt != null">line_overhd_new_accu_qt = #{lineOverhdNewAccuQt},</if>
+            <if test="distTransNewPlanQt != null">dist_trans_new_plan_qt = #{distTransNewPlanQt},</if>
+            <if test="distTransNewAccuQt != null">dist_trans_new_accu_qt = #{distTransNewAccuQt},</if>
+            <if test="lowVoltLinePlanQt != null">low_volt_line_plan_qt = #{lowVoltLinePlanQt},</if>
+            <if test="lowVoltLineAccuQt != null">low_volt_line_accu_qt = #{lowVoltLineAccuQt},</if>
+            <if test="towerPlanQt != null">tower_plan_qt = #{towerPlanQt},</if>
+            <if test="towerAccuQt != null">tower_accu_qt = #{towerAccuQt},</if>
+            <if test="ringCabinetPlanQt != null">ring_cabinet_plan_qt = #{ringCabinetPlanQt},</if>
+            <if test="ringCabinetAccuQt != null">ring_cabinet_accu_qt = #{ringCabinetAccuQt},</if>
+            <if test="poleTabPlanQt != null">pole_tab_plan_qt = #{poleTabPlanQt},</if>
+            <if test="poleTabAccuQt != null">pole_tab_accu_qt = #{poleTabAccuQt},</if>
+            <if test="stdOrgNo != null">std_org_no = #{stdOrgNo},</if>
+            <if test="stdOrgNm != null">std_org_nm = #{stdOrgNm},</if>
+            <if test="stdCityOrgNo != null">std_city_org_no = #{stdCityOrgNo},</if>
+            <if test="stdCityOrgNm != null">std_city_org_nm = #{stdCityOrgNm},</if>
+            <if test="stdCountyOrgNo != null">std_county_org_no = #{stdCountyOrgNo},</if>
+            <if test="stdCountyOrgNm != null">std_county_org_nm = #{stdCountyOrgNm},</if>
+            <if test="dataDt != null">data_dt = #{dataDt},</if>
+            <if test="etlTm != null">etl_tm = #{etlTm},</if>
+            <if test="dealStatus != null">deal_status = #{dealStatus},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deletePdmWorkCompleStatisticsTmpById" parameterType="String">
+        delete from pdm_work_comple_statistics_tmp where id = #{id}
+    </delete>
+
+    <delete id="deletePdmWorkCompleStatisticsTmpByIds" parameterType="String">
+        delete from pdm_work_comple_statistics_tmp where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -234,7 +234,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and risk_type not in ('0','1')
             </if>
         </where>
-        order by  plan_start_wk_tm
+        order by  plan_start_wk_tm desc
     </select>
 
     <select id="selectPdmWorkPlanById" parameterType="Long" resultMap="PdmWorkPlanResult">