导出功能提交

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

@@ -111,4 +111,17 @@ public class PdmLineController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 导出线路完成情况列表
+     */
+    @ApiOperation(value = "导出线路完成情况列表")
+    @Log(title = "导出线路完成情况列表", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportComplete")
+    public void exportComplete(HttpServletResponse response, PdmLineComplete complete)
+    {
+        List<PdmLineComplete> list = pdmLineService.selectCompleteList(complete);
+        ExcelUtil<PdmLineComplete> util = new ExcelUtil<>(PdmLineComplete.class);
+        util.exportExcel(response, list, "线路完成情况列表");
+    }
+
 }

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

@@ -2,6 +2,9 @@ package com.ruoyi.powerdistribution.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -27,6 +30,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author ruoyi
  * @date 2024-12-05
  */
+@Api(value = "PdmMaintenanceProcessController", tags = "检修计划全流程管理")
 @RestController
 @RequestMapping("/powerdistribution/process")
 public class PdmMaintenanceProcessController extends BaseController
@@ -37,6 +41,7 @@ public class PdmMaintenanceProcessController extends BaseController
     /**
      * 查询检修计划全流程管理列表
      */
+    @ApiOperation(value = "查询检修计划全流程管理列表", notes = "查询检修计划全流程管理列表")
     @GetMapping("/list")
     public TableDataInfo list(PdmMaintenanceProcess pdmMaintenanceProcess)
     {
@@ -48,6 +53,7 @@ public class PdmMaintenanceProcessController extends BaseController
     /**
      * 导出检修计划全流程管理列表
      */
+    @ApiOperation(value = "导出检修计划全流程管理列表", notes = "导出检修计划全流程管理列表")
     @Log(title = "检修计划全流程管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, PdmMaintenanceProcess pdmMaintenanceProcess)

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

@@ -23,7 +23,6 @@ public class PdmLine extends BaseEntity
     private Long id;
 
     /** 记录ID  */
-    @Excel(name = "记录ID ")
     private String recId;
 
     /** 线路名称  */
@@ -83,19 +82,15 @@ public class PdmLine extends BaseEntity
     private String orgNm;
 
     /** 标准创建人编码  */
-    @Excel(name = "标准创建人编码 ")
     private String stdCreatorNo;
 
     /** 标准创建人名称  */
-    @Excel(name = "标准创建人名称 ")
     private String stdCreatorNm;
 
     /** 标准修改人编码  */
-    @Excel(name = "标准修改人编码 ")
     private String stdUpdatorNo;
 
     /** 标准修改人名称  */
-    @Excel(name = "标准修改人名称 ")
     private String stdUpdatorNm;
 
     /** 标准单位编码  */
@@ -123,7 +118,6 @@ public class PdmLine extends BaseEntity
     private String stdCountyOrgNm;
 
     /** 数据日期  */
-    @Excel(name = "数据日期 ")
     private String dataDt;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date faultPoweroffTm;
@@ -132,7 +126,6 @@ public class PdmLine extends BaseEntity
 
     /** etl时间戳  */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "etl时间戳 ", width = 30, dateFormat = "yyyy-MM-dd")
     private Date etlTm;
 
     public void setId(Long id)

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

@@ -27,7 +27,7 @@ public class PdmMaintenanceProcess extends BaseEntity
     private String planCode;
 
     /** 周计划编号 */
-    //@Excel(name = "周计划编号")
+    @Excel(name = "周计划编号")
     private String planCodeW;
 
     /** 月计划停电设备数 */
@@ -71,27 +71,31 @@ public class PdmMaintenanceProcess extends BaseEntity
     private String declarAgency;
 
     /** 是否需要上传检修方案0-不需要，1-需要,2-已上传 */
-    @Excel(name = "是否需要上传检修方案0-不需要，1-需要,2-已上传")
     private String isMaintenance;
 
     /** 是否需要审批0-不需要，1-需要，2-已上传 */
-    @Excel(name = "是否需要审批0-不需要，1-需要，2-已上传")
     private String isApprove;
 
     /** 检修方案地址 */
-    @Excel(name = "检修方案地址")
     private String maintenanceFilePath;
 
     /** 审批方案地址 */
-    @Excel(name = "审批方案地址")
     private String approveFilePath;
 
     private String maintenanceFileName;
 
     private String approveFileName;
-    @Excel(name = "审批方案地址")
+
+    @Excel(name = "周计划开始时间")
+    private String weekStartDt;
+
+    @Excel(name = "周计划结束时间")
+    private String weekendDt;
+
+    @Excel(name = "时户数")
     private String hourNum;
 
+    @Excel(name = "考核金额")
     private List<Double> examiAmount;
 //    @Excel(name = "党政一把手考核金额")
 //    private String manageAmt;

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

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 施工车辆告警历史对象 pdm_vehicle_alarm_hist
- * 
+ *
  * @author ruoyi
  * @date 2025-01-23
  */
@@ -40,52 +40,57 @@ public class PdmVehicleAlarmHist extends BaseEntity
 
     private  String endDate;
 
+    @Excel(name = "所属车组")
     private String vehicleGroup;
 
+    @Excel(name = "事件开始日期")
     private String eventStartDate;
 
-    public void setId(Long id) 
+    @Excel(name = "备注")
+    private String remark;
+
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setVehicleNo(String vehicleNo) 
+    public void setVehicleNo(String vehicleNo)
     {
         this.vehicleNo = vehicleNo;
     }
 
-    public String getVehicleNo() 
+    public String getVehicleNo()
     {
         return vehicleNo;
     }
-    public void setOccurDate(String occurDate) 
+    public void setOccurDate(String occurDate)
     {
         this.occurDate = occurDate;
     }
 
-    public String getOccurDate() 
+    public String getOccurDate()
     {
         return occurDate;
     }
-    public void setAlarmCd(String alarmCd) 
+    public void setAlarmCd(String alarmCd)
     {
         this.alarmCd = alarmCd;
     }
 
-    public String getAlarmCd() 
+    public String getAlarmCd()
     {
         return alarmCd;
     }
-    public void setAlarmDesc(String alarmDesc) 
+    public void setAlarmDesc(String alarmDesc)
     {
         this.alarmDesc = alarmDesc;
     }
 
-    public String getAlarmDesc() 
+    public String getAlarmDesc()
     {
         return alarmDesc;
     }

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/vo/PdmLineComplete.java

@@ -12,24 +12,33 @@ import java.math.BigDecimal;
 @Data
 public class PdmLineComplete extends PdmLine {
 
+
     /** 计划检修后无故障持续时间 */
+    @Excel(name = "计划检修后无故障持续时间 ")
     private String faultFreeDuration;
 
+
     /** 奖励金额 */
+    @Excel(name = "奖励金额 ")
     private BigDecimal rewardAmount;
+
     /**
      * 停电次数
      */
+    @Excel(name = "运维单位id ")
     private String poweroffNum;
     /**
      * 是否检修超期(1-是，0-否)
      */
+    @Excel(name = "是否检修超期(1-是，0-否) ")
     private  String isMaintOverdue;
     /**
      * 是否重复停电(1-是，0-否)
      */
+    @Excel(name = "是否重复停电(1-是，0-否)")
     private String isRepeatPoweroff;
 
+    @Excel(name = "运维单位id ")
     private String branchLineNm;
 
 }

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

@@ -29,6 +29,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="hourNum"    column="hour_num"    />
+        <result property="weekStartDt"    column="week_start_dt"    />
+        <result property="weekendDt"    column="week_end_dt"    />
+
         <result property="examiAmount"    column="exami_Amount"  typeHandler="com.ruoyi.common.handler.ListTypeHandler" javaType="java.util.List" />
         <!--result property="manageAssistantAmt"    column="manage_assistant_amt"    />
         <result property="deptDirectorAmt"    column="dept_director_amt"    />

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

@@ -43,7 +43,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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 ads_cst_hywzqlc_pdmworkcomplestatistics_wf
+        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 ads_cst_hywzqlc_pdmworkcomplestatistics_wf
     </sql>
 
     <select id="selectPdmWorkCompleStatisticsTmpList" parameterType="PdmWorkCompleStatisticsTmp" resultMap="PdmWorkCompleStatisticsTmpResult">