Răsfoiți Sursa

停电完成情况 提交

zx 5 luni în urmă
părinte
comite
736a81153e

+ 0 - 2
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/controller/PdmStopRecordsController.java

@@ -9,8 +9,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

+ 42 - 0
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/controller/StopTargetAndActualController.java

@@ -0,0 +1,42 @@
+package com.ruoyi.powerdistribution.controller;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.powerdistribution.domain.vo.StopTargetAndRecords;
+import com.ruoyi.powerdistribution.service.IPdmStopTargeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 停电完成情况Controller
+ *
+ * @author ruoyi
+ * @date 2024-12-09
+ */
+@RestController
+@Api(value = "StopTargetAndActualController", tags = "停电完成情况")
+@RequestMapping("/power/stopActual")
+public class StopTargetAndActualController extends BaseController {
+
+    @Autowired
+    private IPdmStopTargeService pdmStopTargeService;
+
+    /**
+     * 查询停电完成情况
+     */
+    @ApiOperation(value = "查询停电完成情况")
+    @GetMapping("/list")
+    public TableDataInfo list(String reportYear)
+    {
+        List<StopTargetAndRecords> list = pdmStopTargeService.selectTargetAndActual(reportYear);
+        return getDataTable(list);
+    }
+
+
+}

+ 1621 - 173
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/PdmStopRecords.java

@@ -12,104 +12,522 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 可靠性停电记录对象 pdm_stop_records
  *
  * @author ruoyi
- * @date 2024-12-11
+ * @date 2024-12-18
  */
 public class PdmStopRecords extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    /** 主键ID */
     private Long id;
 
+    /** 供服系统主键ID */
+    @Excel(name = "供服系统主键ID")
+    private String feedServSysId;
+
     /** 事件序号 */
     @Excel(name = "事件序号")
-    private String stopNo;
+    private String eventSn;
+
+    /** 责任部门编码 */
+    @Excel(name = "责任部门编码")
+    private String dutyDeptNo;
+
+    /** 责任部门名称 */
+    @Excel(name = "责任部门名称")
+    private String dutyDeptNm;
+
+    /** 责任部门分担比例 */
+    @Excel(name = "责任部门分担比例")
+    private BigDecimal dutyDeptRespRatio;
+
+    /** 停电起始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "停电起始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date poweroffStartTm;
+
+    /** 停电终止时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "停电终止时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date poweroffTermTm;
+
+    /** 停电持续时间(单位:h) */
+    @Excel(name = "停电持续时间(单位:h)")
+    private BigDecimal poweroffDurationTm;
+
+    /** 管理属性(城区、县公司) */
+    @Excel(name = "管理属性(城区、县公司)")
+    private String mgmtAttr;
+
+    /** 地区特征代码 */
+    @Excel(name = "地区特征代码")
+    private String regionFeatCd;
+
+    /** 地区特征描述 */
+    @Excel(name = "地区特征描述")
+    private String regionFeatDsc;
+
+    /** 单位编码 */
+    @Excel(name = "单位编码")
+    private String orgNo;
+
+    /** 单位名称 */
+    @Excel(name = "单位名称")
+    private String orgNm;
+
+    /** 单位性质代码 */
+    @Excel(name = "单位性质代码")
+    private String orgNatureCd;
+
+    /** 单位性质描述 */
+    @Excel(name = "单位性质描述")
+    private String orgNatureDsc;
+
+    /** 停电性质代码 */
+    @Excel(name = "停电性质代码")
+    private String poweroffNatureCd;
+
+    /** 停电性质描述 */
+    @Excel(name = "停电性质描述")
+    private String poweroffNatureDsc;
+
+    /** 研判停电性质代码 */
+    @Excel(name = "研判停电性质代码")
+    private String judgePoweroffNatureCd;
+
+    /** 研判停电性质描述 */
+    @Excel(name = "研判停电性质描述")
+    private String judgePoweroffNatureDsc;
+
+    /** 停电责任原因编码 */
+    @Excel(name = "停电责任原因编码")
+    private String poweroffDutyCausNo;
+
+    /** 停电责任原因名称 */
+    @Excel(name = "停电责任原因名称")
+    private String poweroffDutyCausNm;
+
+    /** 停电设备编码 */
+    @Excel(name = "停电设备编码")
+    private String poweroffEqpNo;
+
+    /** 停电设备名称 */
+    @Excel(name = "停电设备名称")
+    private String poweroffEqpNm;
+
+    /** 停电技术原因编码 */
+    @Excel(name = "停电技术原因编码")
+    private String poweroffTechCausNo;
+
+    /** 停电技术原因名称 */
+    @Excel(name = "停电技术原因名称")
+    private String poweroffTechCausNm;
 
-    /** 线路ID */
-    @Excel(name = "线路ID")
+    /** 特殊事件分析代码 */
+    @Excel(name = "特殊事件分析代码")
+    private String specEventAnalCd;
+
+    /** 特殊事件分析描述 */
+    @Excel(name = "特殊事件分析描述")
+    private String specEventAnalDsc;
+
+    /** 是否重大事件日(1:是,0:否) */
+    @Excel(name = "是否重大事件日(1:是,0:否)")
+    private String isMajorEventDay;
+
+    /** 异常状态代码 */
+    @Excel(name = "异常状态代码")
+    private String excpStCd;
+
+    /** 异常状态描述 */
+    @Excel(name = "异常状态描述")
+    private String excpStDsc;
+
+    /** 异常数据原因代码 */
+    @Excel(name = "异常数据原因代码")
+    private String excpDataCausCd;
+
+    /** 异常数据原因描述 */
+    @Excel(name = "异常数据原因描述")
+    private String excpDataCausDsc;
+
+    /** 规划特征 */
+    @Excel(name = "规划特征")
+    private String programmeFeat;
+
+    /** 操作标志代码 */
+    @Excel(name = "操作标志代码")
+    private String operaFlgCd;
+
+    /** 操作标志描述 */
+    @Excel(name = "操作标志描述")
+    private String operaFlgDsc;
+
+    /** 生成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "生成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createTm;
+
+    /** 确认时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "确认时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date affirmTm;
+
+    /** 入库时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "入库时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date enterTm;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updateTm;
+
+    /** 推送标志代码 */
+    @Excel(name = "推送标志代码")
+    private String pushFlgCd;
+
+    /** 推送标志描述 */
+    @Excel(name = "推送标志描述")
+    private String pushFlgDsc;
+
+    /** 变电站名称 */
+    @Excel(name = "变电站名称")
+    private String subsNm;
+
+    /** 线路id */
+    @Excel(name = "线路id")
     private String lineId;
 
     /** 线路名称 */
     @Excel(name = "线路名称")
-    private String lineName;
+    private String lineNm;
 
-    /** 主分支id */
-    @Excel(name = "主分支id")
-    private String branchId;
+    /** 备注信息 */
+    @Excel(name = "备注信息")
+    private String remarkInfo;
 
-    /** 主分支名称 */
-    @Excel(name = "主分支名称")
-    private String branchName;
+    /** 操作员 */
+    @Excel(name = "操作员")
+    private String operator;
 
-    /** 数据状态 */
-    @Excel(name = "数据状态")
-    private String dataStatus;
+    /** 操作时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date operaTm;
 
-    /** 推送状态 */
-    @Excel(name = "推送状态")
-    private String pushStatus;
+    /** 锁定标志代码 */
+    @Excel(name = "锁定标志代码")
+    private String lockingFlgCd;
 
-    /** 是否可维修 */
-    @Excel(name = "是否可维修")
-    private String repairFlag;
+    /** 锁定标志描述 */
+    @Excel(name = "锁定标志描述")
+    private String lockingFlgDsc;
 
-    /** 事件类型 */
-    @Excel(name = "事件类型")
-    private String eventType;
+    /** 分区单位 */
+    @Excel(name = "分区单位")
+    private String parOrg;
 
-    /** 停电起始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "停电起始时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date startDate;
+    /** 录入方式代码 */
+    @Excel(name = "录入方式代码")
+    private String entryModeCd;
 
-    /** 停电终止时间 */
+    /** 录入方式描述 */
+    @Excel(name = "录入方式描述")
+    private String entryModeDsc;
+
+    /** 推送状态代码 */
+    @Excel(name = "推送状态代码")
+    private String pushStCd;
+
+    /** 推送状态描述 */
+    @Excel(name = "推送状态描述")
+    private String pushStDsc;
+
+    /** 是否上送总部(1:是,0:否) */
+    @Excel(name = "是否上送总部(1:是,0:否)")
+    private String isRptHeaddept;
+
+    /** 上报拒绝原因 */
+    @Excel(name = "上报拒绝原因")
+    private String rptRejectCaus;
+
+    /** 数据类型代码(可多值,逗号分隔) */
+    @Excel(name = "数据类型代码(可多值,逗号分隔)")
+    private String dataTypCd;
+
+    /** 数据类型描述 */
+    @Excel(name = "数据类型描述")
+    private String dataTypDsc;
+
+    /** 是否出错代码 */
+    @Excel(name = "是否出错代码")
+    private String isErrorCd;
+
+    /** 是否出错描述 */
+    @Excel(name = "是否出错描述")
+    private String isErrorDsc;
+
+    /** 数据来源代码(可多值,逗号分隔) */
+    @Excel(name = "数据来源代码(可多值,逗号分隔)")
+    private String dataSrcCd;
+
+    /** 数据来源描述 */
+    @Excel(name = "数据来源描述")
+    private String dataSrcDsc;
+
+    /** 是否编辑(1:是,0:否) */
+    @Excel(name = "是否编辑(1:是,0:否)")
+    private String isEdit;
+
+    /** 是否合规(1:是,0:否) */
+    @Excel(name = "是否合规(1:是,0:否)")
+    private String isCmpl;
+
+    /** 是否确认(1:是,0:否) */
+    @Excel(name = "是否确认(1:是,0:否)")
+    private String isAffirm;
+
+    /** 是否忽略(1:是,0:否) */
+    @Excel(name = "是否忽略(1:是,0:否)")
+    private String isNeglect;
+
+    /** 是否最终数据(1:是,0:否) */
+    @Excel(name = "是否最终数据(1:是,0:否)")
+    private String isEndData;
+
+    /** 最终事件类型代码 */
+    @Excel(name = "最终事件类型代码")
+    private String endEventTypCd;
+
+    /** 最终事件类型描述 */
+    @Excel(name = "最终事件类型描述")
+    private String endEventTypDsc;
+
+    /** 事件特殊处理标志(大于1就要根据情况拆分) */
+    @Excel(name = "事件特殊处理标志(大于1就要根据情况拆分)")
+    private String eventSpecHandlFlg;
+
+    /** 是否拆分事件(1:是,0:否) */
+    @Excel(name = "是否拆分事件(1:是,0:否)")
+    private String isSplitEvent;
+
+    /** 事件降级代码 */
+    @Excel(name = "事件降级代码")
+    private String eventDemotionCd;
+
+    /** 事件降级描述 */
+    @Excel(name = "事件降级描述")
+    private String eventDemotionDsc;
+
+    /** 第三级事件id */
+    @Excel(name = "第三级事件id")
+    private String thirdStageEventId;
+
+    /** 数据版本 */
+    @Excel(name = "数据版本")
+    private String dataVer;
+
+    /** 停电容时 */
+    @Excel(name = "停电容时")
+    private BigDecimal poweroffCapHour;
+
+    /** 停电容量(单位:kWA) */
+    @Excel(name = "停电容量(单位:kWA)")
+    private BigDecimal poweroffCap;
+
+    /** 线次数(各线路停运的总和) */
+    @Excel(name = "线次数(各线路停运的总和)")
+    private BigDecimal lineNum;
+
+    /** 时户数(该段时间内,各户停的时间总和,事件模块录入) */
+    @Excel(name = "时户数(该段时间内,各户停的时间总和,事件模块录入)")
+    private BigDecimal hourNum;
+
+    /** 缺供电量(缺供电量>=0 用作指标计算的基础值,单位:kWh) */
+    @Excel(name = "缺供电量(缺供电量>=0 用作指标计算的基础值,单位:kWh)")
+    private BigDecimal deficiencyKwh;
+
+    /** 户次数(该段时间内,停的户数总和) */
+    @Excel(name = "户次数(该段时间内,停的户数总和)")
+    private BigDecimal householdNum;
+
+    /** 户次数_1 */
+    @Excel(name = "户次数_1")
+    private BigDecimal householdNum1;
+
+    /** 时户数_1 */
+    @Excel(name = "时户数_1")
+    private BigDecimal hourNum1;
+
+    /** 户次数_2 */
+    @Excel(name = "户次数_2")
+    private BigDecimal householdNum2;
+
+    /** 时户数_2 */
+    @Excel(name = "时户数_2")
+    private BigDecimal hourNum2;
+
+    /** 户次数_3 */
+    @Excel(name = "户次数_3")
+    private BigDecimal householdNum3;
+
+    /** 时户数_3 */
+    @Excel(name = "时户数_3")
+    private BigDecimal hourNum3;
+
+    /** 户次数_4 */
+    @Excel(name = "户次数_4")
+    private BigDecimal householdNum4;
+
+    /** 时户数_4 */
+    @Excel(name = "时户数_4")
+    private BigDecimal hourNum4;
+
+    /** 市中心停电容量(单位:kWA) */
+    @Excel(name = "市中心停电容量(单位:kWA)")
+    private BigDecimal cityCenterPoweroffCap;
+
+    /** 市区停电容量(单位:kWA) */
+    @Excel(name = "市区停电容量(单位:kWA)")
+    private BigDecimal cityPoweroffCap;
+
+    /** 城镇停电容量(单位:kWA) */
+    @Excel(name = "城镇停电容量(单位:kWA)")
+    private BigDecimal citiesTownsPoweroffCap;
+
+    /** 农村停电容量(单位:kWA) */
+    @Excel(name = "农村停电容量(单位:kWA)")
+    private BigDecimal cysidePoweroffCap;
+
+    /** 补录停电容时 */
+    @Excel(name = "补录停电容时")
+    private BigDecimal reentryPoweroffCapHour;
+
+    /** 补录停电容量(单位:kWA) */
+    @Excel(name = "补录停电容量(单位:kWA)")
+    private BigDecimal reentryPoweroffCap;
+
+    /** 补录线次数 */
+    @Excel(name = "补录线次数")
+    private BigDecimal reentryLineCount;
+
+    /** 补录时户数 */
+    @Excel(name = "补录时户数")
+    private BigDecimal reentryHourNum;
+
+    /** 补录缺供电量(单位:kWh) */
+    @Excel(name = "补录缺供电量(单位:kWh)")
+    private BigDecimal reentryDeficiencyKwh;
+
+    /** 补录户次数 */
+    @Excel(name = "补录户次数")
+    private BigDecimal reentryHouseholdNum;
+
+    /** 总停电容时 */
+    @Excel(name = "总停电容时")
+    private BigDecimal totalPoweroffCapHour;
+
+    /** 总停电容量(单位:kWA) */
+    @Excel(name = "总停电容量(单位:kWA)")
+    private BigDecimal totalPoweroffCap;
+
+    /** 总限次数 */
+    @Excel(name = "总限次数")
+    private BigDecimal totalLimitNum;
+
+    /** 总时户数 */
+    @Excel(name = "总时户数")
+    private BigDecimal totalHourNum;
+
+    /** 总缺供电量(单位:kWh) */
+    @Excel(name = "总缺供电量(单位:kWh)")
+    private BigDecimal totalDeficiencyKwh;
+
+    /** 总户次数 */
+    @Excel(name = "总户次数")
+    private BigDecimal totalHouseholdNum;
+
+    /** 标准单位编码 */
+    @Excel(name = "标准单位编码")
+    private String stdOrgNo;
+
+    /** 标准单位名称 */
+    @Excel(name = "标准单位名称")
+    private String stdOrgNm;
+
+    /** 标准区县单位编码 */
+    @Excel(name = "标准区县单位编码")
+    private String stdCountyOrgNo;
+
+    /** 标准区县单位名称 */
+    @Excel(name = "标准区县单位名称")
+    private String stdCountyOrgNm;
+
+    /** 标准地市单位名称 */
+    @Excel(name = "标准地市单位名称")
+    private String stdCityOrgNm;
+
+    /** 数据日期 */
+    @Excel(name = "数据日期")
+    private String dataDt;
+
+    /** etl时间戳 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "停电终止时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date endDate;
+    @Excel(name = "etl时间戳", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date etlTm;
 
-    /** 可靠性停电时户数 */
-    @Excel(name = "可靠性停电时户数")
-    private BigDecimal stopNum;
+    /** 判断原因代码 */
+    @Excel(name = "判断原因代码")
+    private String judgingCausCd;
 
-    /** 停电性质-研判 */
-    @Excel(name = "停电性质-研判")
-    private String stopType;
+    /** 判断原因描述 */
+    @Excel(name = "判断原因描述")
+    private String judgingCausDsc;
 
-    /** 市公司ID */
-    @Excel(name = "市公司ID")
-    private String cityCompanyId;
+    /** 事件类型代码 */
+    @Excel(name = "事件类型代码")
+    private String eventTypCd;
 
-    /** 市公司名称 */
-    @Excel(name = "市公司名称")
-    private String cityCompanyName;
+    /** 事件类型描述 */
+    @Excel(name = "事件类型描述")
+    private String eventTypDsc;
 
-    /** 县公司ID */
-    @Excel(name = "县公司ID")
-    private String countyCompanyId;
+    /** 是否有分析报告(1是0否) */
+    @Excel(name = "是否有分析报告(1是0否)")
+    private String isHaveAnalRpt;
 
-    /** 县公司名称 */
-    @Excel(name = "县公司名称")
-    private String countyCompanyName;
+    /** 是否专变事件(1是0否)   */
+    @Excel(name = "是否专变事件(1是0否)  ")
+    private String isPrivEvent;
 
-    /** 供电所名称 */
-    @Excel(name = "供电所名称")
-    private String powerStationId;
+    /** 停电原因               */
+    @Excel(name = "停电原因              ")
+    private String poweroffCaus;
 
-    /** 供电所名称 */
-    @Excel(name = "供电所名称")
-    private String powerStationName;
+    /** 降级标识               */
+    @Excel(name = "降级标识              ")
+    private String demotionId;
 
-    /** 单位编码 */
-    @Excel(name = "单位编码")
-    private String companyNo;
+    /** 是否供服数据(1是0否)   */
+    @Excel(name = "是否供服数据(1是0否)  ")
+    private String isPssData;
+
+    /** 是否正式数据(1是0否)   */
+    @Excel(name = "是否正式数据(1是0否)  ")
+    private String isFormalityData;
 
-    /** 站点ID */
-    @Excel(name = "站点ID")
-    private String siteId;
+    /** 数据来源     */
+    @Excel(name = "数据来源    ")
+    private String dataSrc;
 
-    /** 站点名称 */
-    @Excel(name = "站点名称")
-    private String siteName;
+    /** 年分区 */
+    @Excel(name = "年分区")
+    private String parYear;
+
+    /** 标准地市单位编码 */
+    @Excel(name = "标准地市单位编码")
+    private String stdCityOrgNo;
 
     public void setId(Long id)
     {
@@ -120,231 +538,1261 @@ public class PdmStopRecords extends BaseEntity
     {
         return id;
     }
-    public void setStopNo(String stopNo)
+    public void setFeedServSysId(String feedServSysId)
     {
-        this.stopNo = stopNo;
+        this.feedServSysId = feedServSysId;
     }
 
-    public String getStopNo()
+    public String getFeedServSysId()
     {
-        return stopNo;
+        return feedServSysId;
     }
-    public void setLineId(String lineId)
+    public void setEventSn(String eventSn)
     {
-        this.lineId = lineId;
+        this.eventSn = eventSn;
     }
 
-    public String getLineId()
+    public String getEventSn()
     {
-        return lineId;
+        return eventSn;
+    }
+    public void setDutyDeptNo(String dutyDeptNo)
+    {
+        this.dutyDeptNo = dutyDeptNo;
+    }
+
+    public String getDutyDeptNo()
+    {
+        return dutyDeptNo;
+    }
+    public void setDutyDeptNm(String dutyDeptNm)
+    {
+        this.dutyDeptNm = dutyDeptNm;
+    }
+
+    public String getDutyDeptNm()
+    {
+        return dutyDeptNm;
+    }
+    public void setDutyDeptRespRatio(BigDecimal dutyDeptRespRatio)
+    {
+        this.dutyDeptRespRatio = dutyDeptRespRatio;
+    }
+
+    public BigDecimal getDutyDeptRespRatio()
+    {
+        return dutyDeptRespRatio;
+    }
+    public void setPoweroffStartTm(Date poweroffStartTm)
+    {
+        this.poweroffStartTm = poweroffStartTm;
+    }
+
+    public Date getPoweroffStartTm()
+    {
+        return poweroffStartTm;
+    }
+    public void setPoweroffTermTm(Date poweroffTermTm)
+    {
+        this.poweroffTermTm = poweroffTermTm;
+    }
+
+    public Date getPoweroffTermTm()
+    {
+        return poweroffTermTm;
+    }
+    public void setPoweroffDurationTm(BigDecimal poweroffDurationTm)
+    {
+        this.poweroffDurationTm = poweroffDurationTm;
+    }
+
+    public BigDecimal getPoweroffDurationTm()
+    {
+        return poweroffDurationTm;
+    }
+    public void setMgmtAttr(String mgmtAttr)
+    {
+        this.mgmtAttr = mgmtAttr;
+    }
+
+    public String getMgmtAttr()
+    {
+        return mgmtAttr;
+    }
+    public void setRegionFeatCd(String regionFeatCd)
+    {
+        this.regionFeatCd = regionFeatCd;
+    }
+
+    public String getRegionFeatCd()
+    {
+        return regionFeatCd;
+    }
+    public void setRegionFeatDsc(String regionFeatDsc)
+    {
+        this.regionFeatDsc = regionFeatDsc;
+    }
+
+    public String getRegionFeatDsc()
+    {
+        return regionFeatDsc;
+    }
+    public void setOrgNo(String orgNo)
+    {
+        this.orgNo = orgNo;
+    }
+
+    public String getOrgNo()
+    {
+        return orgNo;
+    }
+    public void setOrgNm(String orgNm)
+    {
+        this.orgNm = orgNm;
+    }
+
+    public String getOrgNm()
+    {
+        return orgNm;
+    }
+    public void setOrgNatureCd(String orgNatureCd)
+    {
+        this.orgNatureCd = orgNatureCd;
+    }
+
+    public String getOrgNatureCd()
+    {
+        return orgNatureCd;
+    }
+    public void setOrgNatureDsc(String orgNatureDsc)
+    {
+        this.orgNatureDsc = orgNatureDsc;
+    }
+
+    public String getOrgNatureDsc()
+    {
+        return orgNatureDsc;
+    }
+    public void setPoweroffNatureCd(String poweroffNatureCd)
+    {
+        this.poweroffNatureCd = poweroffNatureCd;
+    }
+
+    public String getPoweroffNatureCd()
+    {
+        return poweroffNatureCd;
+    }
+    public void setPoweroffNatureDsc(String poweroffNatureDsc)
+    {
+        this.poweroffNatureDsc = poweroffNatureDsc;
+    }
+
+    public String getPoweroffNatureDsc()
+    {
+        return poweroffNatureDsc;
+    }
+    public void setJudgePoweroffNatureCd(String judgePoweroffNatureCd)
+    {
+        this.judgePoweroffNatureCd = judgePoweroffNatureCd;
+    }
+
+    public String getJudgePoweroffNatureCd()
+    {
+        return judgePoweroffNatureCd;
+    }
+    public void setJudgePoweroffNatureDsc(String judgePoweroffNatureDsc)
+    {
+        this.judgePoweroffNatureDsc = judgePoweroffNatureDsc;
+    }
+
+    public String getJudgePoweroffNatureDsc()
+    {
+        return judgePoweroffNatureDsc;
+    }
+    public void setPoweroffDutyCausNo(String poweroffDutyCausNo)
+    {
+        this.poweroffDutyCausNo = poweroffDutyCausNo;
+    }
+
+    public String getPoweroffDutyCausNo()
+    {
+        return poweroffDutyCausNo;
+    }
+    public void setPoweroffDutyCausNm(String poweroffDutyCausNm)
+    {
+        this.poweroffDutyCausNm = poweroffDutyCausNm;
+    }
+
+    public String getPoweroffDutyCausNm()
+    {
+        return poweroffDutyCausNm;
+    }
+    public void setPoweroffEqpNo(String poweroffEqpNo)
+    {
+        this.poweroffEqpNo = poweroffEqpNo;
+    }
+
+    public String getPoweroffEqpNo()
+    {
+        return poweroffEqpNo;
+    }
+    public void setPoweroffEqpNm(String poweroffEqpNm)
+    {
+        this.poweroffEqpNm = poweroffEqpNm;
+    }
+
+    public String getPoweroffEqpNm()
+    {
+        return poweroffEqpNm;
+    }
+    public void setPoweroffTechCausNo(String poweroffTechCausNo)
+    {
+        this.poweroffTechCausNo = poweroffTechCausNo;
+    }
+
+    public String getPoweroffTechCausNo()
+    {
+        return poweroffTechCausNo;
+    }
+    public void setPoweroffTechCausNm(String poweroffTechCausNm)
+    {
+        this.poweroffTechCausNm = poweroffTechCausNm;
+    }
+
+    public String getPoweroffTechCausNm()
+    {
+        return poweroffTechCausNm;
+    }
+    public void setSpecEventAnalCd(String specEventAnalCd)
+    {
+        this.specEventAnalCd = specEventAnalCd;
+    }
+
+    public String getSpecEventAnalCd()
+    {
+        return specEventAnalCd;
+    }
+    public void setSpecEventAnalDsc(String specEventAnalDsc)
+    {
+        this.specEventAnalDsc = specEventAnalDsc;
+    }
+
+    public String getSpecEventAnalDsc()
+    {
+        return specEventAnalDsc;
+    }
+    public void setIsMajorEventDay(String isMajorEventDay)
+    {
+        this.isMajorEventDay = isMajorEventDay;
+    }
+
+    public String getIsMajorEventDay()
+    {
+        return isMajorEventDay;
+    }
+    public void setExcpStCd(String excpStCd)
+    {
+        this.excpStCd = excpStCd;
+    }
+
+    public String getExcpStCd()
+    {
+        return excpStCd;
+    }
+    public void setExcpStDsc(String excpStDsc)
+    {
+        this.excpStDsc = excpStDsc;
+    }
+
+    public String getExcpStDsc()
+    {
+        return excpStDsc;
+    }
+    public void setExcpDataCausCd(String excpDataCausCd)
+    {
+        this.excpDataCausCd = excpDataCausCd;
+    }
+
+    public String getExcpDataCausCd()
+    {
+        return excpDataCausCd;
+    }
+    public void setExcpDataCausDsc(String excpDataCausDsc)
+    {
+        this.excpDataCausDsc = excpDataCausDsc;
+    }
+
+    public String getExcpDataCausDsc()
+    {
+        return excpDataCausDsc;
+    }
+    public void setProgrammeFeat(String programmeFeat)
+    {
+        this.programmeFeat = programmeFeat;
+    }
+
+    public String getProgrammeFeat()
+    {
+        return programmeFeat;
+    }
+    public void setOperaFlgCd(String operaFlgCd)
+    {
+        this.operaFlgCd = operaFlgCd;
+    }
+
+    public String getOperaFlgCd()
+    {
+        return operaFlgCd;
+    }
+    public void setOperaFlgDsc(String operaFlgDsc)
+    {
+        this.operaFlgDsc = operaFlgDsc;
+    }
+
+    public String getOperaFlgDsc()
+    {
+        return operaFlgDsc;
+    }
+    public void setCreateTm(Date createTm)
+    {
+        this.createTm = createTm;
+    }
+
+    public Date getCreateTm()
+    {
+        return createTm;
+    }
+    public void setAffirmTm(Date affirmTm)
+    {
+        this.affirmTm = affirmTm;
+    }
+
+    public Date getAffirmTm()
+    {
+        return affirmTm;
+    }
+    public void setEnterTm(Date enterTm)
+    {
+        this.enterTm = enterTm;
+    }
+
+    public Date getEnterTm()
+    {
+        return enterTm;
+    }
+    public void setUpdateTm(Date updateTm)
+    {
+        this.updateTm = updateTm;
+    }
+
+    public Date getUpdateTm()
+    {
+        return updateTm;
+    }
+    public void setPushFlgCd(String pushFlgCd)
+    {
+        this.pushFlgCd = pushFlgCd;
+    }
+
+    public String getPushFlgCd()
+    {
+        return pushFlgCd;
+    }
+    public void setPushFlgDsc(String pushFlgDsc)
+    {
+        this.pushFlgDsc = pushFlgDsc;
+    }
+
+    public String getPushFlgDsc()
+    {
+        return pushFlgDsc;
+    }
+    public void setSubsNm(String subsNm)
+    {
+        this.subsNm = subsNm;
+    }
+
+    public String getSubsNm()
+    {
+        return subsNm;
+    }
+    public void setLineId(String lineId)
+    {
+        this.lineId = lineId;
+    }
+
+    public String getLineId()
+    {
+        return lineId;
+    }
+    public void setLineNm(String lineNm)
+    {
+        this.lineNm = lineNm;
+    }
+
+    public String getLineNm()
+    {
+        return lineNm;
+    }
+    public void setRemarkInfo(String remarkInfo)
+    {
+        this.remarkInfo = remarkInfo;
+    }
+
+    public String getRemarkInfo()
+    {
+        return remarkInfo;
+    }
+    public void setOperator(String operator)
+    {
+        this.operator = operator;
+    }
+
+    public String getOperator()
+    {
+        return operator;
+    }
+    public void setOperaTm(Date operaTm)
+    {
+        this.operaTm = operaTm;
+    }
+
+    public Date getOperaTm()
+    {
+        return operaTm;
+    }
+    public void setLockingFlgCd(String lockingFlgCd)
+    {
+        this.lockingFlgCd = lockingFlgCd;
+    }
+
+    public String getLockingFlgCd()
+    {
+        return lockingFlgCd;
+    }
+    public void setLockingFlgDsc(String lockingFlgDsc)
+    {
+        this.lockingFlgDsc = lockingFlgDsc;
+    }
+
+    public String getLockingFlgDsc()
+    {
+        return lockingFlgDsc;
+    }
+    public void setParOrg(String parOrg)
+    {
+        this.parOrg = parOrg;
+    }
+
+    public String getParOrg()
+    {
+        return parOrg;
+    }
+    public void setEntryModeCd(String entryModeCd)
+    {
+        this.entryModeCd = entryModeCd;
+    }
+
+    public String getEntryModeCd()
+    {
+        return entryModeCd;
+    }
+    public void setEntryModeDsc(String entryModeDsc)
+    {
+        this.entryModeDsc = entryModeDsc;
+    }
+
+    public String getEntryModeDsc()
+    {
+        return entryModeDsc;
+    }
+    public void setPushStCd(String pushStCd)
+    {
+        this.pushStCd = pushStCd;
+    }
+
+    public String getPushStCd()
+    {
+        return pushStCd;
+    }
+    public void setPushStDsc(String pushStDsc)
+    {
+        this.pushStDsc = pushStDsc;
+    }
+
+    public String getPushStDsc()
+    {
+        return pushStDsc;
+    }
+    public void setIsRptHeaddept(String isRptHeaddept)
+    {
+        this.isRptHeaddept = isRptHeaddept;
+    }
+
+    public String getIsRptHeaddept()
+    {
+        return isRptHeaddept;
+    }
+    public void setRptRejectCaus(String rptRejectCaus)
+    {
+        this.rptRejectCaus = rptRejectCaus;
+    }
+
+    public String getRptRejectCaus()
+    {
+        return rptRejectCaus;
+    }
+    public void setDataTypCd(String dataTypCd)
+    {
+        this.dataTypCd = dataTypCd;
+    }
+
+    public String getDataTypCd()
+    {
+        return dataTypCd;
+    }
+    public void setDataTypDsc(String dataTypDsc)
+    {
+        this.dataTypDsc = dataTypDsc;
+    }
+
+    public String getDataTypDsc()
+    {
+        return dataTypDsc;
+    }
+    public void setIsErrorCd(String isErrorCd)
+    {
+        this.isErrorCd = isErrorCd;
+    }
+
+    public String getIsErrorCd()
+    {
+        return isErrorCd;
+    }
+    public void setIsErrorDsc(String isErrorDsc)
+    {
+        this.isErrorDsc = isErrorDsc;
+    }
+
+    public String getIsErrorDsc()
+    {
+        return isErrorDsc;
+    }
+    public void setDataSrcCd(String dataSrcCd)
+    {
+        this.dataSrcCd = dataSrcCd;
+    }
+
+    public String getDataSrcCd()
+    {
+        return dataSrcCd;
+    }
+    public void setDataSrcDsc(String dataSrcDsc)
+    {
+        this.dataSrcDsc = dataSrcDsc;
+    }
+
+    public String getDataSrcDsc()
+    {
+        return dataSrcDsc;
+    }
+    public void setIsEdit(String isEdit)
+    {
+        this.isEdit = isEdit;
+    }
+
+    public String getIsEdit()
+    {
+        return isEdit;
+    }
+    public void setIsCmpl(String isCmpl)
+    {
+        this.isCmpl = isCmpl;
+    }
+
+    public String getIsCmpl()
+    {
+        return isCmpl;
+    }
+    public void setIsAffirm(String isAffirm)
+    {
+        this.isAffirm = isAffirm;
+    }
+
+    public String getIsAffirm()
+    {
+        return isAffirm;
+    }
+    public void setIsNeglect(String isNeglect)
+    {
+        this.isNeglect = isNeglect;
+    }
+
+    public String getIsNeglect()
+    {
+        return isNeglect;
+    }
+    public void setIsEndData(String isEndData)
+    {
+        this.isEndData = isEndData;
+    }
+
+    public String getIsEndData()
+    {
+        return isEndData;
+    }
+    public void setEndEventTypCd(String endEventTypCd)
+    {
+        this.endEventTypCd = endEventTypCd;
+    }
+
+    public String getEndEventTypCd()
+    {
+        return endEventTypCd;
+    }
+    public void setEndEventTypDsc(String endEventTypDsc)
+    {
+        this.endEventTypDsc = endEventTypDsc;
+    }
+
+    public String getEndEventTypDsc()
+    {
+        return endEventTypDsc;
+    }
+    public void setEventSpecHandlFlg(String eventSpecHandlFlg)
+    {
+        this.eventSpecHandlFlg = eventSpecHandlFlg;
+    }
+
+    public String getEventSpecHandlFlg()
+    {
+        return eventSpecHandlFlg;
+    }
+    public void setIsSplitEvent(String isSplitEvent)
+    {
+        this.isSplitEvent = isSplitEvent;
+    }
+
+    public String getIsSplitEvent()
+    {
+        return isSplitEvent;
+    }
+    public void setEventDemotionCd(String eventDemotionCd)
+    {
+        this.eventDemotionCd = eventDemotionCd;
+    }
+
+    public String getEventDemotionCd()
+    {
+        return eventDemotionCd;
+    }
+    public void setEventDemotionDsc(String eventDemotionDsc)
+    {
+        this.eventDemotionDsc = eventDemotionDsc;
+    }
+
+    public String getEventDemotionDsc()
+    {
+        return eventDemotionDsc;
+    }
+    public void setThirdStageEventId(String thirdStageEventId)
+    {
+        this.thirdStageEventId = thirdStageEventId;
+    }
+
+    public String getThirdStageEventId()
+    {
+        return thirdStageEventId;
+    }
+    public void setDataVer(String dataVer)
+    {
+        this.dataVer = dataVer;
+    }
+
+    public String getDataVer()
+    {
+        return dataVer;
+    }
+    public void setPoweroffCapHour(BigDecimal poweroffCapHour)
+    {
+        this.poweroffCapHour = poweroffCapHour;
+    }
+
+    public BigDecimal getPoweroffCapHour()
+    {
+        return poweroffCapHour;
+    }
+    public void setPoweroffCap(BigDecimal poweroffCap)
+    {
+        this.poweroffCap = poweroffCap;
+    }
+
+    public BigDecimal getPoweroffCap()
+    {
+        return poweroffCap;
+    }
+    public void setLineNum(BigDecimal lineNum)
+    {
+        this.lineNum = lineNum;
+    }
+
+    public BigDecimal getLineNum()
+    {
+        return lineNum;
+    }
+    public void setHourNum(BigDecimal hourNum)
+    {
+        this.hourNum = hourNum;
+    }
+
+    public BigDecimal getHourNum()
+    {
+        return hourNum;
+    }
+    public void setDeficiencyKwh(BigDecimal deficiencyKwh)
+    {
+        this.deficiencyKwh = deficiencyKwh;
+    }
+
+    public BigDecimal getDeficiencyKwh()
+    {
+        return deficiencyKwh;
+    }
+    public void setHouseholdNum(BigDecimal householdNum)
+    {
+        this.householdNum = householdNum;
+    }
+
+    public BigDecimal getHouseholdNum()
+    {
+        return householdNum;
+    }
+    public void setHouseholdNum1(BigDecimal householdNum1)
+    {
+        this.householdNum1 = householdNum1;
+    }
+
+    public BigDecimal getHouseholdNum1()
+    {
+        return householdNum1;
+    }
+    public void setHourNum1(BigDecimal hourNum1)
+    {
+        this.hourNum1 = hourNum1;
+    }
+
+    public BigDecimal getHourNum1()
+    {
+        return hourNum1;
+    }
+    public void setHouseholdNum2(BigDecimal householdNum2)
+    {
+        this.householdNum2 = householdNum2;
+    }
+
+    public BigDecimal getHouseholdNum2()
+    {
+        return householdNum2;
+    }
+    public void setHourNum2(BigDecimal hourNum2)
+    {
+        this.hourNum2 = hourNum2;
+    }
+
+    public BigDecimal getHourNum2()
+    {
+        return hourNum2;
+    }
+    public void setHouseholdNum3(BigDecimal householdNum3)
+    {
+        this.householdNum3 = householdNum3;
+    }
+
+    public BigDecimal getHouseholdNum3()
+    {
+        return householdNum3;
+    }
+    public void setHourNum3(BigDecimal hourNum3)
+    {
+        this.hourNum3 = hourNum3;
+    }
+
+    public BigDecimal getHourNum3()
+    {
+        return hourNum3;
+    }
+    public void setHouseholdNum4(BigDecimal householdNum4)
+    {
+        this.householdNum4 = householdNum4;
+    }
+
+    public BigDecimal getHouseholdNum4()
+    {
+        return householdNum4;
+    }
+    public void setHourNum4(BigDecimal hourNum4)
+    {
+        this.hourNum4 = hourNum4;
+    }
+
+    public BigDecimal getHourNum4()
+    {
+        return hourNum4;
+    }
+    public void setCityCenterPoweroffCap(BigDecimal cityCenterPoweroffCap)
+    {
+        this.cityCenterPoweroffCap = cityCenterPoweroffCap;
+    }
+
+    public BigDecimal getCityCenterPoweroffCap()
+    {
+        return cityCenterPoweroffCap;
+    }
+    public void setCityPoweroffCap(BigDecimal cityPoweroffCap)
+    {
+        this.cityPoweroffCap = cityPoweroffCap;
+    }
+
+    public BigDecimal getCityPoweroffCap()
+    {
+        return cityPoweroffCap;
+    }
+    public void setCitiesTownsPoweroffCap(BigDecimal citiesTownsPoweroffCap)
+    {
+        this.citiesTownsPoweroffCap = citiesTownsPoweroffCap;
+    }
+
+    public BigDecimal getCitiesTownsPoweroffCap()
+    {
+        return citiesTownsPoweroffCap;
+    }
+    public void setCysidePoweroffCap(BigDecimal cysidePoweroffCap)
+    {
+        this.cysidePoweroffCap = cysidePoweroffCap;
+    }
+
+    public BigDecimal getCysidePoweroffCap()
+    {
+        return cysidePoweroffCap;
+    }
+    public void setReentryPoweroffCapHour(BigDecimal reentryPoweroffCapHour)
+    {
+        this.reentryPoweroffCapHour = reentryPoweroffCapHour;
+    }
+
+    public BigDecimal getReentryPoweroffCapHour()
+    {
+        return reentryPoweroffCapHour;
+    }
+    public void setReentryPoweroffCap(BigDecimal reentryPoweroffCap)
+    {
+        this.reentryPoweroffCap = reentryPoweroffCap;
+    }
+
+    public BigDecimal getReentryPoweroffCap()
+    {
+        return reentryPoweroffCap;
+    }
+    public void setReentryLineCount(BigDecimal reentryLineCount)
+    {
+        this.reentryLineCount = reentryLineCount;
+    }
+
+    public BigDecimal getReentryLineCount()
+    {
+        return reentryLineCount;
+    }
+    public void setReentryHourNum(BigDecimal reentryHourNum)
+    {
+        this.reentryHourNum = reentryHourNum;
+    }
+
+    public BigDecimal getReentryHourNum()
+    {
+        return reentryHourNum;
+    }
+    public void setReentryDeficiencyKwh(BigDecimal reentryDeficiencyKwh)
+    {
+        this.reentryDeficiencyKwh = reentryDeficiencyKwh;
+    }
+
+    public BigDecimal getReentryDeficiencyKwh()
+    {
+        return reentryDeficiencyKwh;
+    }
+    public void setReentryHouseholdNum(BigDecimal reentryHouseholdNum)
+    {
+        this.reentryHouseholdNum = reentryHouseholdNum;
+    }
+
+    public BigDecimal getReentryHouseholdNum()
+    {
+        return reentryHouseholdNum;
+    }
+    public void setTotalPoweroffCapHour(BigDecimal totalPoweroffCapHour)
+    {
+        this.totalPoweroffCapHour = totalPoweroffCapHour;
+    }
+
+    public BigDecimal getTotalPoweroffCapHour()
+    {
+        return totalPoweroffCapHour;
+    }
+    public void setTotalPoweroffCap(BigDecimal totalPoweroffCap)
+    {
+        this.totalPoweroffCap = totalPoweroffCap;
+    }
+
+    public BigDecimal getTotalPoweroffCap()
+    {
+        return totalPoweroffCap;
+    }
+    public void setTotalLimitNum(BigDecimal totalLimitNum)
+    {
+        this.totalLimitNum = totalLimitNum;
+    }
+
+    public BigDecimal getTotalLimitNum()
+    {
+        return totalLimitNum;
+    }
+    public void setTotalHourNum(BigDecimal totalHourNum)
+    {
+        this.totalHourNum = totalHourNum;
+    }
+
+    public BigDecimal getTotalHourNum()
+    {
+        return totalHourNum;
+    }
+    public void setTotalDeficiencyKwh(BigDecimal totalDeficiencyKwh)
+    {
+        this.totalDeficiencyKwh = totalDeficiencyKwh;
+    }
+
+    public BigDecimal getTotalDeficiencyKwh()
+    {
+        return totalDeficiencyKwh;
+    }
+    public void setTotalHouseholdNum(BigDecimal totalHouseholdNum)
+    {
+        this.totalHouseholdNum = totalHouseholdNum;
+    }
+
+    public BigDecimal getTotalHouseholdNum()
+    {
+        return totalHouseholdNum;
     }
-    public void setLineName(String lineName)
+    public void setStdOrgNo(String stdOrgNo)
     {
-        this.lineName = lineName;
+        this.stdOrgNo = stdOrgNo;
     }
 
-    public String getLineName()
+    public String getStdOrgNo()
     {
-        return lineName;
+        return stdOrgNo;
     }
-    public void setBranchId(String branchId)
+    public void setStdOrgNm(String stdOrgNm)
     {
-        this.branchId = branchId;
+        this.stdOrgNm = stdOrgNm;
     }
 
-    public String getBranchId()
+    public String getStdOrgNm()
     {
-        return branchId;
+        return stdOrgNm;
     }
-    public void setBranchName(String branchName)
+    public void setStdCountyOrgNo(String stdCountyOrgNo)
     {
-        this.branchName = branchName;
+        this.stdCountyOrgNo = stdCountyOrgNo;
     }
 
-    public String getBranchName()
+    public String getStdCountyOrgNo()
     {
-        return branchName;
+        return stdCountyOrgNo;
     }
-    public void setDataStatus(String dataStatus)
+    public void setStdCountyOrgNm(String stdCountyOrgNm)
     {
-        this.dataStatus = dataStatus;
+        this.stdCountyOrgNm = stdCountyOrgNm;
     }
 
-    public String getDataStatus()
+    public String getStdCountyOrgNm()
     {
-        return dataStatus;
+        return stdCountyOrgNm;
     }
-    public void setPushStatus(String pushStatus)
+    public void setStdCityOrgNm(String stdCityOrgNm)
     {
-        this.pushStatus = pushStatus;
+        this.stdCityOrgNm = stdCityOrgNm;
     }
 
-    public String getPushStatus()
+    public String getStdCityOrgNm()
     {
-        return pushStatus;
+        return stdCityOrgNm;
     }
-    public void setRepairFlag(String repairFlag)
+    public void setDataDt(String dataDt)
     {
-        this.repairFlag = repairFlag;
+        this.dataDt = dataDt;
     }
 
-    public String getRepairFlag()
+    public String getDataDt()
     {
-        return repairFlag;
+        return dataDt;
     }
-    public void setEventType(String eventType)
+    public void setEtlTm(Date etlTm)
     {
-        this.eventType = eventType;
+        this.etlTm = etlTm;
     }
 
-    public String getEventType()
+    public Date getEtlTm()
     {
-        return eventType;
+        return etlTm;
     }
-    public void setStartDate(Date startDate)
+    public void setJudgingCausCd(String judgingCausCd)
     {
-        this.startDate = startDate;
+        this.judgingCausCd = judgingCausCd;
     }
 
-    public Date getStartDate()
+    public String getJudgingCausCd()
     {
-        return startDate;
+        return judgingCausCd;
     }
-    public void setEndDate(Date endDate)
+    public void setJudgingCausDsc(String judgingCausDsc)
     {
-        this.endDate = endDate;
+        this.judgingCausDsc = judgingCausDsc;
     }
 
-    public Date getEndDate()
+    public String getJudgingCausDsc()
     {
-        return endDate;
+        return judgingCausDsc;
     }
-    public void setStopNum(BigDecimal stopNum)
+    public void setEventTypCd(String eventTypCd)
     {
-        this.stopNum = stopNum;
+        this.eventTypCd = eventTypCd;
     }
 
-    public BigDecimal getStopNum()
+    public String getEventTypCd()
     {
-        return stopNum;
+        return eventTypCd;
     }
-    public void setStopType(String stopType)
+    public void setEventTypDsc(String eventTypDsc)
     {
-        this.stopType = stopType;
+        this.eventTypDsc = eventTypDsc;
     }
 
-    public String getStopType()
+    public String getEventTypDsc()
     {
-        return stopType;
+        return eventTypDsc;
     }
-    public void setCityCompanyId(String cityCompanyId)
+    public void setIsHaveAnalRpt(String isHaveAnalRpt)
     {
-        this.cityCompanyId = cityCompanyId;
+        this.isHaveAnalRpt = isHaveAnalRpt;
     }
 
-    public String getCityCompanyId()
+    public String getIsHaveAnalRpt()
     {
-        return cityCompanyId;
+        return isHaveAnalRpt;
     }
-    public void setCityCompanyName(String cityCompanyName)
+    public void setIsPrivEvent(String isPrivEvent)
     {
-        this.cityCompanyName = cityCompanyName;
+        this.isPrivEvent = isPrivEvent;
     }
 
-    public String getCityCompanyName()
+    public String getIsPrivEvent()
     {
-        return cityCompanyName;
+        return isPrivEvent;
     }
-    public void setCountyCompanyId(String countyCompanyId)
+    public void setPoweroffCaus(String poweroffCaus)
     {
-        this.countyCompanyId = countyCompanyId;
+        this.poweroffCaus = poweroffCaus;
     }
 
-    public String getCountyCompanyId()
+    public String getPoweroffCaus()
     {
-        return countyCompanyId;
+        return poweroffCaus;
     }
-    public void setCountyCompanyName(String countyCompanyName)
+    public void setDemotionId(String demotionId)
     {
-        this.countyCompanyName = countyCompanyName;
+        this.demotionId = demotionId;
     }
 
-    public String getCountyCompanyName()
+    public String getDemotionId()
     {
-        return countyCompanyName;
+        return demotionId;
     }
-    public void setPowerStationId(String powerStationId)
+    public void setIsPssData(String isPssData)
     {
-        this.powerStationId = powerStationId;
+        this.isPssData = isPssData;
     }
 
-    public String getPowerStationId()
+    public String getIsPssData()
     {
-        return powerStationId;
+        return isPssData;
     }
-    public void setPowerStationName(String powerStationName)
+    public void setIsFormalityData(String isFormalityData)
     {
-        this.powerStationName = powerStationName;
+        this.isFormalityData = isFormalityData;
     }
 
-    public String getPowerStationName()
+    public String getIsFormalityData()
     {
-        return powerStationName;
+        return isFormalityData;
     }
-    public void setCompanyNo(String companyNo)
+    public void setDataSrc(String dataSrc)
     {
-        this.companyNo = companyNo;
+        this.dataSrc = dataSrc;
     }
 
-    public String getCompanyNo()
+    public String getDataSrc()
     {
-        return companyNo;
+        return dataSrc;
     }
-    public void setSiteId(String siteId)
+    public void setParYear(String parYear)
     {
-        this.siteId = siteId;
+        this.parYear = parYear;
     }
 
-    public String getSiteId()
+    public String getParYear()
     {
-        return siteId;
+        return parYear;
     }
-    public void setSiteName(String siteName)
+    public void setStdCityOrgNo(String stdCityOrgNo)
     {
-        this.siteName = siteName;
+        this.stdCityOrgNo = stdCityOrgNo;
     }
 
-    public String getSiteName()
+    public String getStdCityOrgNo()
     {
-        return siteName;
+        return stdCityOrgNo;
     }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("stopNo", getStopNo())
+            .append("feedServSysId", getFeedServSysId())
+            .append("eventSn", getEventSn())
+            .append("dutyDeptNo", getDutyDeptNo())
+            .append("dutyDeptNm", getDutyDeptNm())
+            .append("dutyDeptRespRatio", getDutyDeptRespRatio())
+            .append("poweroffStartTm", getPoweroffStartTm())
+            .append("poweroffTermTm", getPoweroffTermTm())
+            .append("poweroffDurationTm", getPoweroffDurationTm())
+            .append("mgmtAttr", getMgmtAttr())
+            .append("regionFeatCd", getRegionFeatCd())
+            .append("regionFeatDsc", getRegionFeatDsc())
+            .append("orgNo", getOrgNo())
+            .append("orgNm", getOrgNm())
+            .append("orgNatureCd", getOrgNatureCd())
+            .append("orgNatureDsc", getOrgNatureDsc())
+            .append("poweroffNatureCd", getPoweroffNatureCd())
+            .append("poweroffNatureDsc", getPoweroffNatureDsc())
+            .append("judgePoweroffNatureCd", getJudgePoweroffNatureCd())
+            .append("judgePoweroffNatureDsc", getJudgePoweroffNatureDsc())
+            .append("poweroffDutyCausNo", getPoweroffDutyCausNo())
+            .append("poweroffDutyCausNm", getPoweroffDutyCausNm())
+            .append("poweroffEqpNo", getPoweroffEqpNo())
+            .append("poweroffEqpNm", getPoweroffEqpNm())
+            .append("poweroffTechCausNo", getPoweroffTechCausNo())
+            .append("poweroffTechCausNm", getPoweroffTechCausNm())
+            .append("specEventAnalCd", getSpecEventAnalCd())
+            .append("specEventAnalDsc", getSpecEventAnalDsc())
+            .append("isMajorEventDay", getIsMajorEventDay())
+            .append("excpStCd", getExcpStCd())
+            .append("excpStDsc", getExcpStDsc())
+            .append("excpDataCausCd", getExcpDataCausCd())
+            .append("excpDataCausDsc", getExcpDataCausDsc())
+            .append("programmeFeat", getProgrammeFeat())
+            .append("operaFlgCd", getOperaFlgCd())
+            .append("operaFlgDsc", getOperaFlgDsc())
+            .append("createTm", getCreateTm())
+            .append("affirmTm", getAffirmTm())
+            .append("enterTm", getEnterTm())
+            .append("updateTm", getUpdateTm())
+            .append("pushFlgCd", getPushFlgCd())
+            .append("pushFlgDsc", getPushFlgDsc())
+            .append("subsNm", getSubsNm())
             .append("lineId", getLineId())
-            .append("lineName", getLineName())
-            .append("branchId", getBranchId())
-            .append("branchName", getBranchName())
-            .append("dataStatus", getDataStatus())
-            .append("pushStatus", getPushStatus())
-            .append("repairFlag", getRepairFlag())
-            .append("eventType", getEventType())
-            .append("startDate", getStartDate())
-            .append("endDate", getEndDate())
-            .append("stopNum", getStopNum())
-            .append("stopType", getStopType())
-            .append("cityCompanyId", getCityCompanyId())
-            .append("cityCompanyName", getCityCompanyName())
-            .append("countyCompanyId", getCountyCompanyId())
-            .append("countyCompanyName", getCountyCompanyName())
-            .append("powerStationId", getPowerStationId())
-            .append("powerStationName", getPowerStationName())
-            .append("companyNo", getCompanyNo())
-            .append("siteId", getSiteId())
-            .append("siteName", getSiteName())
+            .append("lineNm", getLineNm())
+            .append("remarkInfo", getRemarkInfo())
+            .append("operator", getOperator())
+            .append("operaTm", getOperaTm())
+            .append("lockingFlgCd", getLockingFlgCd())
+            .append("lockingFlgDsc", getLockingFlgDsc())
+            .append("parOrg", getParOrg())
+            .append("entryModeCd", getEntryModeCd())
+            .append("entryModeDsc", getEntryModeDsc())
+            .append("pushStCd", getPushStCd())
+            .append("pushStDsc", getPushStDsc())
+            .append("isRptHeaddept", getIsRptHeaddept())
+            .append("rptRejectCaus", getRptRejectCaus())
+            .append("dataTypCd", getDataTypCd())
+            .append("dataTypDsc", getDataTypDsc())
+            .append("isErrorCd", getIsErrorCd())
+            .append("isErrorDsc", getIsErrorDsc())
+            .append("dataSrcCd", getDataSrcCd())
+            .append("dataSrcDsc", getDataSrcDsc())
+            .append("isEdit", getIsEdit())
+            .append("isCmpl", getIsCmpl())
+            .append("isAffirm", getIsAffirm())
+            .append("isNeglect", getIsNeglect())
+            .append("isEndData", getIsEndData())
+            .append("endEventTypCd", getEndEventTypCd())
+            .append("endEventTypDsc", getEndEventTypDsc())
+            .append("eventSpecHandlFlg", getEventSpecHandlFlg())
+            .append("isSplitEvent", getIsSplitEvent())
+            .append("eventDemotionCd", getEventDemotionCd())
+            .append("eventDemotionDsc", getEventDemotionDsc())
+            .append("thirdStageEventId", getThirdStageEventId())
+            .append("dataVer", getDataVer())
+            .append("poweroffCapHour", getPoweroffCapHour())
+            .append("poweroffCap", getPoweroffCap())
+            .append("lineNum", getLineNum())
+            .append("hourNum", getHourNum())
+            .append("deficiencyKwh", getDeficiencyKwh())
+            .append("householdNum", getHouseholdNum())
+            .append("householdNum1", getHouseholdNum1())
+            .append("hourNum1", getHourNum1())
+            .append("householdNum2", getHouseholdNum2())
+            .append("hourNum2", getHourNum2())
+            .append("householdNum3", getHouseholdNum3())
+            .append("hourNum3", getHourNum3())
+            .append("householdNum4", getHouseholdNum4())
+            .append("hourNum4", getHourNum4())
+            .append("cityCenterPoweroffCap", getCityCenterPoweroffCap())
+            .append("cityPoweroffCap", getCityPoweroffCap())
+            .append("citiesTownsPoweroffCap", getCitiesTownsPoweroffCap())
+            .append("cysidePoweroffCap", getCysidePoweroffCap())
+            .append("reentryPoweroffCapHour", getReentryPoweroffCapHour())
+            .append("reentryPoweroffCap", getReentryPoweroffCap())
+            .append("reentryLineCount", getReentryLineCount())
+            .append("reentryHourNum", getReentryHourNum())
+            .append("reentryDeficiencyKwh", getReentryDeficiencyKwh())
+            .append("reentryHouseholdNum", getReentryHouseholdNum())
+            .append("totalPoweroffCapHour", getTotalPoweroffCapHour())
+            .append("totalPoweroffCap", getTotalPoweroffCap())
+            .append("totalLimitNum", getTotalLimitNum())
+            .append("totalHourNum", getTotalHourNum())
+            .append("totalDeficiencyKwh", getTotalDeficiencyKwh())
+            .append("totalHouseholdNum", getTotalHouseholdNum())
+            .append("stdOrgNo", getStdOrgNo())
+            .append("stdOrgNm", getStdOrgNm())
+            .append("stdCountyOrgNo", getStdCountyOrgNo())
+            .append("stdCountyOrgNm", getStdCountyOrgNm())
+            .append("stdCityOrgNm", getStdCityOrgNm())
+            .append("dataDt", getDataDt())
+            .append("etlTm", getEtlTm())
+            .append("judgingCausCd", getJudgingCausCd())
+            .append("judgingCausDsc", getJudgingCausDsc())
+            .append("eventTypCd", getEventTypCd())
+            .append("eventTypDsc", getEventTypDsc())
+            .append("isHaveAnalRpt", getIsHaveAnalRpt())
+            .append("isPrivEvent", getIsPrivEvent())
+            .append("poweroffCaus", getPoweroffCaus())
+            .append("demotionId", getDemotionId())
+            .append("isPssData", getIsPssData())
+            .append("isFormalityData", getIsFormalityData())
+            .append("dataSrc", getDataSrc())
+            .append("parYear", getParYear())
+            .append("stdCityOrgNo", getStdCityOrgNo())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())

+ 74 - 0
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/vo/StopTargetAndRecords.java

@@ -0,0 +1,74 @@
+package com.ruoyi.powerdistribution.domain.vo;
+
+import com.ruoyi.powerdistribution.domain.PdmStopTarge;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class StopTargetAndRecords extends PdmStopTarge {
+
+    /**
+     * 实际停电总时长
+     */
+    private BigDecimal stopTotalActual;
+
+    /**
+     * 计划停电总时长
+     */
+    private BigDecimal planStopTotalActual;
+
+    /**
+     * 故障停电总时长
+     */
+    private BigDecimal errorStopTotalActual;
+
+    /**
+     * 实际停电时长-1月
+     */
+    private BigDecimal stopMonth01Actual;
+    private BigDecimal stopMonth02Actual;
+    private BigDecimal stopMonth03Actual;
+    private BigDecimal stopMonth04Actual;
+    private BigDecimal stopMonth05Actual;
+    private BigDecimal stopMonth06Actual;
+    private BigDecimal stopMonth07Actual;
+    private BigDecimal stopMonth08Actual;
+    private BigDecimal stopMonth09Actual;
+    private BigDecimal stopMonth10Actual;
+    private BigDecimal stopMonth11Actual;
+    private BigDecimal stopMonth12Actual;
+
+    /**
+     * 计划停电-1月
+     */
+    private BigDecimal planStopMonth01Actual;
+    private BigDecimal planStopMonth02Actual;
+    private BigDecimal planStopMonth03Actual;
+    private BigDecimal planStopMonth04Actual;
+    private BigDecimal planStopMonth05Actual;
+    private BigDecimal planStopMonth06Actual;
+    private BigDecimal planStopMonth07Actual;
+    private BigDecimal planStopMonth08Actual;
+    private BigDecimal planStopMonth09Actual;
+    private BigDecimal planStopMonth10Actual;
+    private BigDecimal planStopMonth11Actual;
+    private BigDecimal planStopMonth12Actual;
+
+    /**
+     * 故障停电-1月
+     */
+    private BigDecimal errorStopMonth01Actual;
+    private BigDecimal errorStopMonth02Actual;
+    private BigDecimal errorStopMonth03Actual;
+    private BigDecimal errorStopMonth04Actual;
+    private BigDecimal errorStopMonth05Actual;
+    private BigDecimal errorStopMonth06Actual;
+    private BigDecimal errorStopMonth07Actual;
+    private BigDecimal errorStopMonth08Actual;
+    private BigDecimal errorStopMonth09Actual;
+    private BigDecimal errorStopMonth10Actual;
+    private BigDecimal errorStopMonth11Actual;
+    private BigDecimal errorStopMonth12Actual;
+
+}

+ 1 - 1
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/mapper/PdmStopRecordsMapper.java

@@ -7,7 +7,7 @@ import com.ruoyi.powerdistribution.domain.PdmStopRecords;
  * 可靠性停电记录Mapper接口
  *
  * @author ruoyi
- * @date 2024-12-11
+ * @date 2024-12-18
  */
 public interface PdmStopRecordsMapper
 {

+ 8 - 0
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/mapper/PdmStopTargeMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.powerdistribution.domain.PdmStopTarge;
+import com.ruoyi.powerdistribution.domain.vo.StopTargetAndRecords;
 
 /**
  * 停电预算Mapper接口
@@ -60,4 +61,11 @@ public interface PdmStopTargeMapper extends BaseMapper<PdmStopTarge>
      * @return 结果
      */
     public int deletePdmStopTargeByIds(Long[] ids);
+
+    /**
+     * 获取目标停电和实际停电展板
+     * @param reportYear
+     * @return
+     */
+    List<StopTargetAndRecords> selectTargetAndActual(String reportYear);
 }

+ 1 - 1
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/IPdmStopRecordsService.java

@@ -7,7 +7,7 @@ import com.ruoyi.powerdistribution.domain.PdmStopRecords;
  * 可靠性停电记录Service接口
  *
  * @author ruoyi
- * @date 2024-12-11
+ * @date 2024-12-18
  */
 public interface IPdmStopRecordsService
 {

+ 8 - 0
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/IPdmStopTargeService.java

@@ -2,6 +2,7 @@ package com.ruoyi.powerdistribution.service;
 
 import java.util.List;
 import com.ruoyi.powerdistribution.domain.PdmStopTarge;
+import com.ruoyi.powerdistribution.domain.vo.StopTargetAndRecords;
 
 /**
  * 停电预算Service接口
@@ -66,4 +67,11 @@ public interface IPdmStopTargeService
      * @return
      */
     boolean batchSaveOrUpdate(List<PdmStopTarge> list,String reportYear);
+
+    /**
+     * 获取停电完成情况
+     * @param reportYear
+     * @return
+     */
+    List<StopTargetAndRecords> selectTargetAndActual(String reportYear);
 }

+ 1 - 1
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/impl/PdmStopRecordsServiceImpl.java

@@ -12,7 +12,7 @@ import com.ruoyi.powerdistribution.service.IPdmStopRecordsService;
  * 可靠性停电记录Service业务层处理
  *
  * @author ruoyi
- * @date 2024-12-11
+ * @date 2024-12-18
  */
 @Service
 public class PdmStopRecordsServiceImpl implements IPdmStopRecordsService

+ 6 - 0
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/impl/PdmStopTargeServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.powerdistribution.domain.vo.StopTargetAndRecords;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.powerdistribution.mapper.PdmStopTargeMapper;
@@ -108,4 +109,9 @@ public class PdmStopTargeServiceImpl extends ServiceImpl<PdmStopTargeMapper,PdmS
         }
         return true;
     }
+
+    @Override
+    public List<StopTargetAndRecords> selectTargetAndActual(String reportYear) {
+        return pdmStopTargeMapper.selectTargetAndActual(reportYear);
+    }
 }

Fișier diff suprimat deoarece este prea mare
+ 124 - 22
ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmStopRecordsMapper.xml


+ 55 - 0
ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmStopTargeMapper.xml

@@ -299,4 +299,59 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectTargetAndActual" parameterType="java.lang.String" resultType="com.ruoyi.powerdistribution.domain.vo.StopTargetAndRecords">
+        select * from pdm_stop_targe t1
+        LEFT JOIN
+        (
+        select std_county_org_nm org_name ,
+        SUM(poweroff_duration_tm) stop_total_actual,
+        SUM(IF(poweroff_nature_cd in('2200'),poweroff_duration_tm,0)) as plan_stop_total_actual,
+        SUM(IF(poweroff_nature_cd in('1101','1201'),poweroff_duration_tm,0)) as error_stop_total_actual,
+        SUM(IF(SUBSTRING(data_dt,5,2)='01',poweroff_duration_tm,0)) as stop_month_01_actual,
+        SUM(IF(SUBSTRING(data_dt,5,2)='02',poweroff_duration_tm,0)) as stop_month_02_actual,
+        SUM(IF(SUBSTRING(data_dt,5,2)='03',poweroff_duration_tm,0)) as stop_month_03_actual,
+        SUM(IF(SUBSTRING(data_dt,5,2)='04',poweroff_duration_tm,0)) as stop_month_04_actual,
+        SUM(IF(SUBSTRING(data_dt,5,2)='05',poweroff_duration_tm,0)) as stop_month_05_actual,
+        SUM(IF(SUBSTRING(data_dt,5,2)='06',poweroff_duration_tm,0)) as stop_month_06_actual,
+        SUM(IF(SUBSTRING(data_dt,5,2)='07',poweroff_duration_tm,0)) as stop_month_07_actual,
+        SUM(IF(SUBSTRING(data_dt,5,2)='08',poweroff_duration_tm,0)) as stop_month_08_actual,
+        SUM(IF(SUBSTRING(data_dt,5,2)='09',poweroff_duration_tm,0)) as stop_month_09_actual,
+        SUM(IF(SUBSTRING(data_dt,5,2)='10',poweroff_duration_tm,0)) as stop_month_10_actual,
+        SUM(IF(SUBSTRING(data_dt,5,2)='11',poweroff_duration_tm,0)) as stop_month_11_actual,
+        SUM(IF(SUBSTRING(data_dt,5,2)='12',poweroff_duration_tm,0)) as stop_month_12_actual,
+
+        SUM(IF((poweroff_nature_cd in('2200') and SUBSTRING(data_dt,5,2)='01'),poweroff_duration_tm,0)) as plan_stop_month_01_actual,
+        SUM(IF((poweroff_nature_cd in('2200') and SUBSTRING(data_dt,5,2)='02'),poweroff_duration_tm,0)) as plan_stop_month_02_actual,
+        SUM(IF((poweroff_nature_cd in('2200') and SUBSTRING(data_dt,5,2)='03'),poweroff_duration_tm,0)) as plan_stop_month_03_actual,
+        SUM(IF((poweroff_nature_cd in('2200') and SUBSTRING(data_dt,5,2)='04'),poweroff_duration_tm,0)) as plan_stop_month_04_actual,
+        SUM(IF((poweroff_nature_cd in('2200') and SUBSTRING(data_dt,5,2)='05'),poweroff_duration_tm,0)) as plan_stop_month_05_actual,
+        SUM(IF((poweroff_nature_cd in('2200') and SUBSTRING(data_dt,5,2)='06'),poweroff_duration_tm,0)) as plan_stop_month_06_actual,
+        SUM(IF((poweroff_nature_cd in('2200') and SUBSTRING(data_dt,5,2)='07'),poweroff_duration_tm,0)) as plan_stop_month_07_actual,
+        SUM(IF((poweroff_nature_cd in('2200') and SUBSTRING(data_dt,5,2)='08'),poweroff_duration_tm,0)) as plan_stop_month_08_actual,
+        SUM(IF((poweroff_nature_cd in('2200') and SUBSTRING(data_dt,5,2)='09'),poweroff_duration_tm,0)) as plan_stop_month_09_actual,
+        SUM(IF((poweroff_nature_cd in('2200') and SUBSTRING(data_dt,5,2)='10'),poweroff_duration_tm,0)) as plan_stop_month_10_actual,
+        SUM(IF((poweroff_nature_cd in('2200') and SUBSTRING(data_dt,5,2)='11'),poweroff_duration_tm,0)) as plan_stop_month_11_actual,
+        SUM(IF((poweroff_nature_cd in('2200') and SUBSTRING(data_dt,5,2)='12'),poweroff_duration_tm,0)) as plan_stop_month_12_actual,
+
+        SUM(IF((poweroff_nature_cd in('1101','1201') and SUBSTRING(data_dt,5,2)='01'),poweroff_duration_tm,0)) as error_stop_month_01_actual,
+        SUM(IF((poweroff_nature_cd in('1101','1201') and SUBSTRING(data_dt,5,2)='02'),poweroff_duration_tm,0)) as error_stop_month_02_actual,
+        SUM(IF((poweroff_nature_cd in('1101','1201') and SUBSTRING(data_dt,5,2)='03'),poweroff_duration_tm,0)) as error_stop_month_03_actual,
+        SUM(IF((poweroff_nature_cd in('1101','1201') and SUBSTRING(data_dt,5,2)='04'),poweroff_duration_tm,0)) as error_stop_month_04_actual,
+        SUM(IF((poweroff_nature_cd in('1101','1201') and SUBSTRING(data_dt,5,2)='05'),poweroff_duration_tm,0)) as error_stop_month_05_actual,
+        SUM(IF((poweroff_nature_cd in('1101','1201') and SUBSTRING(data_dt,5,2)='06'),poweroff_duration_tm,0)) as error_stop_month_06_actual,
+        SUM(IF((poweroff_nature_cd in('1101','1201') and SUBSTRING(data_dt,5,2)='07'),poweroff_duration_tm,0)) as error_stop_month_07_actual,
+        SUM(IF((poweroff_nature_cd in('1101','1201') and SUBSTRING(data_dt,5,2)='08'),poweroff_duration_tm,0)) as error_stop_month_08_actual,
+        SUM(IF((poweroff_nature_cd in('1101','1201') and SUBSTRING(data_dt,5,2)='09'),poweroff_duration_tm,0)) as error_stop_month_09_actual,
+        SUM(IF((poweroff_nature_cd in('1101','1201') and SUBSTRING(data_dt,5,2)='10'),poweroff_duration_tm,0)) as error_stop_month_10_actual,
+        SUM(IF((poweroff_nature_cd in('1101','1201') and SUBSTRING(data_dt,5,2)='11'),poweroff_duration_tm,0)) as error_stop_month_11_actual,
+        SUM(IF((poweroff_nature_cd in('1101','1201') and SUBSTRING(data_dt,5,2)='12'),poweroff_duration_tm,0)) as error_stop_month_12_actual
+        from pdm_stop_records
+        where SUBSTRING(data_dt,1,4) = #{reportYear}
+        GROUP BY std_county_org_nm
+        ) t2 on t1.company_name = t2.org_name
+        where  report_year = #{reportYear}
+
+    </select>
+
 </mapper>

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff