Przeglądaj źródła

同步表表名统一修改

zx 1 miesiąc temu
rodzic
commit
1c9a6b8492
28 zmienionych plików z 336 dodań i 334 usunięć
  1. 16 18
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/controller/AdsCstHygszdbbPdmmaintenanceprocessmonthWfController.java
  2. 2 2
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/AdsCstHygszdbbPdmmaintenanceprocessmonthWf.java
  3. 1 1
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/PdmMaintenanceProcess.java
  4. 1 1
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/PdmStopRecords.java
  5. 1 1
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/PdmWorkCompleStatisticsTmp.java
  6. 8 4
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/PdmWorkPlan.java
  7. 2 2
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/dto/AdsCstHygszdbbPdmmaintenanceprocessmonthWfDTO.java
  8. 62 0
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/mapper/AdsCstHygszdbbPdmmaintenanceprocessmonthWfMapper.java
  9. 0 62
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/mapper/AdsCstHywzqlcPdmmaintenanceprocessmonthWfMapper.java
  10. 62 0
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/IAdsCstHygszdbbPdmmaintenanceprocessmonthWfService.java
  11. 0 62
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/IAdsCstHywzqlcPdmmaintenanceprocessmonthWfService.java
  12. 97 0
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/impl/AdsCstHygszdbbPdmmaintenanceprocessmonthWfServiceImpl.java
  13. 0 97
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/impl/AdsCstHywzqlcPdmmaintenanceprocessmonthWfServiceImpl.java
  14. 16 16
      ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/AdsCstHygszdbbPdmmaintenanceprocessmonthWfMapper.xml
  15. 1 1
      ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmBranchLineMapper.xml
  16. 5 5
      ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmLineMapper.xml
  17. 7 7
      ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmMaintenanceProcessMapper.xml
  18. 9 9
      ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmReportAppointmentDayMapper.xml
  19. 4 4
      ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmReportIllegalDayMapper.xml
  20. 2 2
      ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmReportPlanDayMapper.xml
  21. 3 3
      ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmReportPlanNextDayMapper.xml
  22. 6 6
      ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmScoreRankManagerMapper.xml
  23. 6 6
      ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmScoreRankTeamMapper.xml
  24. 6 6
      ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmScoreRankWorkerMapper.xml
  25. 0 0
      ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmStopRecordsMapper.xml
  26. 2 2
      ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmStopTargeMapper.xml
  27. 5 5
      ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmWorkCompleStatisticsTmpMapper.xml
  28. 12 12
      ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmWorkPlanMapper.xml

+ 16 - 18
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/controller/AdsCstHywzqlcPdmmaintenanceprocessmonthWfController.java → ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/controller/AdsCstHygszdbbPdmmaintenanceprocessmonthWfController.java

@@ -3,13 +3,11 @@ package com.ruoyi.powerdistribution.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.powerdistribution.domain.dto.AdsCstHywzqlcPdmmaintenanceprocessmonthWfDTO;
+import com.ruoyi.powerdistribution.domain.dto.AdsCstHygszdbbPdmmaintenanceprocessmonthWfDTO;
 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;
 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;
@@ -19,8 +17,8 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.powerdistribution.domain.AdsCstHywzqlcPdmmaintenanceprocessmonthWf;
-import com.ruoyi.powerdistribution.service.IAdsCstHywzqlcPdmmaintenanceprocessmonthWfService;
+import com.ruoyi.powerdistribution.domain.AdsCstHygszdbbPdmmaintenanceprocessmonthWf;
+import com.ruoyi.powerdistribution.service.IAdsCstHygszdbbPdmmaintenanceprocessmonthWfService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -32,20 +30,20 @@ import com.ruoyi.common.core.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/power/maintenanceMonth")
-public class AdsCstHywzqlcPdmmaintenanceprocessmonthWfController extends BaseController
+public class AdsCstHygszdbbPdmmaintenanceprocessmonthWfController extends BaseController
 {
     @Autowired
-    private IAdsCstHywzqlcPdmmaintenanceprocessmonthWfService adsCstHywzqlcPdmmaintenanceprocessmonthWfService;
+    private IAdsCstHygszdbbPdmmaintenanceprocessmonthWfService adsCstHygszdbbPdmmaintenanceprocessmonthWfService;
 
     /**
      * 查询月计划明细列表
      */
     @ApiOperation(value = "查询月计划明细列表")
     @GetMapping("/list")
-    public TableDataInfo list(AdsCstHywzqlcPdmmaintenanceprocessmonthWfDTO adsCstHywzqlcPdmmaintenanceprocessmonthWf)
+    public TableDataInfo list(AdsCstHygszdbbPdmmaintenanceprocessmonthWfDTO adsCstHygszdbbPdmmaintenanceprocessmonthWf)
     {
         startPage();
-        List<AdsCstHywzqlcPdmmaintenanceprocessmonthWf> list = adsCstHywzqlcPdmmaintenanceprocessmonthWfService.selectAdsCstHywzqlcPdmmaintenanceprocessmonthWfList(adsCstHywzqlcPdmmaintenanceprocessmonthWf);
+        List<AdsCstHygszdbbPdmmaintenanceprocessmonthWf> list = adsCstHygszdbbPdmmaintenanceprocessmonthWfService.selectAdsCstHygszdbbPdmmaintenanceprocessmonthWfList(adsCstHygszdbbPdmmaintenanceprocessmonthWf);
         return getDataTable(list);
     }
 
@@ -55,10 +53,10 @@ public class AdsCstHywzqlcPdmmaintenanceprocessmonthWfController extends BaseCon
     @ApiOperation(value = "导出月计划明细列表")
     @Log(title = "月计划明细", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, AdsCstHywzqlcPdmmaintenanceprocessmonthWfDTO adsCstHywzqlcPdmmaintenanceprocessmonthWf)
+    public void export(HttpServletResponse response, AdsCstHygszdbbPdmmaintenanceprocessmonthWfDTO adsCstHygszdbbPdmmaintenanceprocessmonthWf)
     {
-        List<AdsCstHywzqlcPdmmaintenanceprocessmonthWf> list = adsCstHywzqlcPdmmaintenanceprocessmonthWfService.selectAdsCstHywzqlcPdmmaintenanceprocessmonthWfList(adsCstHywzqlcPdmmaintenanceprocessmonthWf);
-        ExcelUtil<AdsCstHywzqlcPdmmaintenanceprocessmonthWf> util = new ExcelUtil<AdsCstHywzqlcPdmmaintenanceprocessmonthWf>(AdsCstHywzqlcPdmmaintenanceprocessmonthWf.class);
+        List<AdsCstHygszdbbPdmmaintenanceprocessmonthWf> list = adsCstHygszdbbPdmmaintenanceprocessmonthWfService.selectAdsCstHygszdbbPdmmaintenanceprocessmonthWfList(adsCstHygszdbbPdmmaintenanceprocessmonthWf);
+        ExcelUtil<AdsCstHygszdbbPdmmaintenanceprocessmonthWf> util = new ExcelUtil<AdsCstHygszdbbPdmmaintenanceprocessmonthWf>(AdsCstHygszdbbPdmmaintenanceprocessmonthWf.class);
         util.exportExcel(response, list, "月计划明细数据");
     }
 
@@ -69,7 +67,7 @@ public class AdsCstHywzqlcPdmmaintenanceprocessmonthWfController extends BaseCon
     @GetMapping(value = "/{pkId}")
     public AjaxResult getInfo(@PathVariable("pkId") String pkId)
     {
-        return success(adsCstHywzqlcPdmmaintenanceprocessmonthWfService.selectAdsCstHywzqlcPdmmaintenanceprocessmonthWfByPkId(pkId));
+        return success(adsCstHygszdbbPdmmaintenanceprocessmonthWfService.selectAdsCstHygszdbbPdmmaintenanceprocessmonthWfByPkId(pkId));
     }
 
     /**
@@ -77,9 +75,9 @@ public class AdsCstHywzqlcPdmmaintenanceprocessmonthWfController extends BaseCon
      */
     @Log(title = "月计划明细", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody AdsCstHywzqlcPdmmaintenanceprocessmonthWf adsCstHywzqlcPdmmaintenanceprocessmonthWf)
+    public AjaxResult add(@RequestBody AdsCstHygszdbbPdmmaintenanceprocessmonthWf adsCstHygszdbbPdmmaintenanceprocessmonthWf)
     {
-        return toAjax(adsCstHywzqlcPdmmaintenanceprocessmonthWfService.insertAdsCstHywzqlcPdmmaintenanceprocessmonthWf(adsCstHywzqlcPdmmaintenanceprocessmonthWf));
+        return toAjax(adsCstHygszdbbPdmmaintenanceprocessmonthWfService.insertAdsCstHygszdbbPdmmaintenanceprocessmonthWf(adsCstHygszdbbPdmmaintenanceprocessmonthWf));
     }
 
     /**
@@ -88,9 +86,9 @@ public class AdsCstHywzqlcPdmmaintenanceprocessmonthWfController extends BaseCon
     @ApiOperation(value = "修改月计划明细")
     @Log(title = "月计划明细", businessType = BusinessType.UPDATE)
     @PostMapping("/update")
-    public AjaxResult edit(@RequestBody AdsCstHywzqlcPdmmaintenanceprocessmonthWf adsCstHywzqlcPdmmaintenanceprocessmonthWf)
+    public AjaxResult edit(@RequestBody AdsCstHygszdbbPdmmaintenanceprocessmonthWf adsCstHygszdbbPdmmaintenanceprocessmonthWf)
     {
-        return toAjax(adsCstHywzqlcPdmmaintenanceprocessmonthWfService.updateAdsCstHywzqlcPdmmaintenanceprocessmonthWf(adsCstHywzqlcPdmmaintenanceprocessmonthWf));
+        return toAjax(adsCstHygszdbbPdmmaintenanceprocessmonthWfService.updateAdsCstHygszdbbPdmmaintenanceprocessmonthWf(adsCstHygszdbbPdmmaintenanceprocessmonthWf));
     }
 
     /**
@@ -100,6 +98,6 @@ public class AdsCstHywzqlcPdmmaintenanceprocessmonthWfController extends BaseCon
 	@DeleteMapping("/{pkIds}")
     public AjaxResult remove(@PathVariable String[] pkIds)
     {
-        return toAjax(adsCstHywzqlcPdmmaintenanceprocessmonthWfService.deleteAdsCstHywzqlcPdmmaintenanceprocessmonthWfByPkIds(pkIds));
+        return toAjax(adsCstHygszdbbPdmmaintenanceprocessmonthWfService.deleteAdsCstHygszdbbPdmmaintenanceprocessmonthWfByPkIds(pkIds));
     }
 }

+ 2 - 2
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/AdsCstHywzqlcPdmmaintenanceprocessmonthWf.java → ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/AdsCstHygszdbbPdmmaintenanceprocessmonthWf.java

@@ -9,12 +9,12 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 月计划明细对象 ads_cst_hywzqlc_pdmmaintenanceprocessmonth_wf
+ * 月计划明细对象 ads_cst_hygszdbb_pdmmaintenanceprocessmonth_wf
  *
  * @author ruoyi
  * @date 2025-02-26
  */
-public class AdsCstHywzqlcPdmmaintenanceprocessmonthWf extends BaseEntity
+public class AdsCstHygszdbbPdmmaintenanceprocessmonthWf extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 

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

@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 import java.util.List;
 
 /**
- * 检修计划全流程管理对象 ads_cst_hywzqlc_pdmmaintenanceprocess_wf
+ * 检修计划全流程管理对象 ads_cst_hygszdbb_pdmmaintenanceprocess_wf
  *
  * @author ruoyi
  * @date 2024-12-05

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

@@ -9,7 +9,7 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 可靠性停电记录对象 ads_cst_hywzqlc_pdmstoprecords_df
+ * 可靠性停电记录对象 ads_cst_hygszdbb_pdmstoprecords_df
  *
  * @author ruoyi
  * @date 2024-12-18

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

@@ -7,7 +7,7 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 工程量完成情况临时对象 ads_cst_hywzqlc_pdmworkcomplestatistics_wf_tmp
+ * 工程量完成情况临时对象 ads_cst_hygszdbb_pdmworkcomplestatistics_wf_tmp
  *
  * @author ruoyi
  * @date 2025-02-11

+ 8 - 4
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/PdmWorkPlan.java

@@ -11,7 +11,7 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 作业计划对象 ads_cst_hywzqlc_pdmworkplan_df
+ * 作业计划对象 ads_cst_hygszdbb_pdmworkplan_df
  *
  * @author ruoyi
  * @date 2024-12-01
@@ -360,33 +360,37 @@ public class PdmWorkPlan extends BaseEntity
     private String stdCityOrgNo;
 
     /** 计划执行状态描述  */
-    @Excel(name = "计划执行状态描述 ")
+    @Excel(name = "计划执行状态描述")
     private String planExecStDsc;
 
     /** 取消原因  */
-    @Excel(name = "取消原因 ")
+    @Excel(name = "取消原因")
     private String cancelReason;
 
     /** 临时计划原因  */
-    @Excel(name = "临时计划原因 ")
+    @Excel(name = "临时计划原因")
     private String planReason;
 
     /** 风险类型  */
+    @Excel(name = "风险类型")
     private String riskType;
 
     /**
      * 异常类型
      */
+    @Excel(name = "异常类型")
     private String exceptionType;
 
     /**
      * 取消原因类型
      */
+    @Excel(name = "取消原因类型")
     private String cancelType;
 
     /**
      * 临时计划原因类型
      */
+    @Excel(name = "临时计划原因类型")
     private String temporaryType;
 
 

+ 2 - 2
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/dto/AdsCstHywzqlcPdmmaintenanceprocessmonthWfDTO.java → ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/dto/AdsCstHygszdbbPdmmaintenanceprocessmonthWfDTO.java

@@ -1,12 +1,12 @@
 package com.ruoyi.powerdistribution.domain.dto;
 
 
-import com.ruoyi.powerdistribution.domain.AdsCstHywzqlcPdmmaintenanceprocessmonthWf;
+import com.ruoyi.powerdistribution.domain.AdsCstHygszdbbPdmmaintenanceprocessmonthWf;
 
 /**
  * 月计划DTO
  */
-public class AdsCstHywzqlcPdmmaintenanceprocessmonthWfDTO extends AdsCstHywzqlcPdmmaintenanceprocessmonthWf {
+public class AdsCstHygszdbbPdmmaintenanceprocessmonthWfDTO extends AdsCstHygszdbbPdmmaintenanceprocessmonthWf {
 
     /**
      * 查询条件-开始时间

+ 62 - 0
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/mapper/AdsCstHygszdbbPdmmaintenanceprocessmonthWfMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.powerdistribution.mapper;
+
+import java.util.List;
+import com.ruoyi.powerdistribution.domain.AdsCstHygszdbbPdmmaintenanceprocessmonthWf;
+import com.ruoyi.powerdistribution.domain.dto.AdsCstHygszdbbPdmmaintenanceprocessmonthWfDTO;
+
+/**
+ * 月计划明细Mapper接口
+ *
+ * @author ruoyi
+ * @date 2025-02-26
+ */
+public interface AdsCstHygszdbbPdmmaintenanceprocessmonthWfMapper
+{
+    /**
+     * 查询月计划明细
+     *
+     * @param pkId 月计划明细主键
+     * @return 月计划明细
+     */
+    public AdsCstHygszdbbPdmmaintenanceprocessmonthWf selectAdsCstHygszdbbPdmmaintenanceprocessmonthWfByPkId(String pkId);
+
+    /**
+     * 查询月计划明细列表
+     *
+     * @param adsCstHygszdbbPdmmaintenanceprocessmonthWf 月计划明细
+     * @return 月计划明细集合
+     */
+    public List<AdsCstHygszdbbPdmmaintenanceprocessmonthWf> selectAdsCstHygszdbbPdmmaintenanceprocessmonthWfList(AdsCstHygszdbbPdmmaintenanceprocessmonthWfDTO adsCstHygszdbbPdmmaintenanceprocessmonthWf);
+
+    /**
+     * 新增月计划明细
+     *
+     * @param adsCstHygszdbbPdmmaintenanceprocessmonthWf 月计划明细
+     * @return 结果
+     */
+    public int insertAdsCstHygszdbbPdmmaintenanceprocessmonthWf(AdsCstHygszdbbPdmmaintenanceprocessmonthWf adsCstHygszdbbPdmmaintenanceprocessmonthWf);
+
+    /**
+     * 修改月计划明细
+     *
+     * @param adsCstHygszdbbPdmmaintenanceprocessmonthWf 月计划明细
+     * @return 结果
+     */
+    public int updateAdsCstHygszdbbPdmmaintenanceprocessmonthWf(AdsCstHygszdbbPdmmaintenanceprocessmonthWf adsCstHygszdbbPdmmaintenanceprocessmonthWf);
+
+    /**
+     * 删除月计划明细
+     *
+     * @param pkId 月计划明细主键
+     * @return 结果
+     */
+    public int deleteAdsCstHygszdbbPdmmaintenanceprocessmonthWfByPkId(String pkId);
+
+    /**
+     * 批量删除月计划明细
+     *
+     * @param pkIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAdsCstHygszdbbPdmmaintenanceprocessmonthWfByPkIds(String[] pkIds);
+}

+ 0 - 62
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/mapper/AdsCstHywzqlcPdmmaintenanceprocessmonthWfMapper.java

@@ -1,62 +0,0 @@
-package com.ruoyi.powerdistribution.mapper;
-
-import java.util.List;
-import com.ruoyi.powerdistribution.domain.AdsCstHywzqlcPdmmaintenanceprocessmonthWf;
-import com.ruoyi.powerdistribution.domain.dto.AdsCstHywzqlcPdmmaintenanceprocessmonthWfDTO;
-
-/**
- * 月计划明细Mapper接口
- *
- * @author ruoyi
- * @date 2025-02-26
- */
-public interface AdsCstHywzqlcPdmmaintenanceprocessmonthWfMapper
-{
-    /**
-     * 查询月计划明细
-     *
-     * @param pkId 月计划明细主键
-     * @return 月计划明细
-     */
-    public AdsCstHywzqlcPdmmaintenanceprocessmonthWf selectAdsCstHywzqlcPdmmaintenanceprocessmonthWfByPkId(String pkId);
-
-    /**
-     * 查询月计划明细列表
-     *
-     * @param adsCstHywzqlcPdmmaintenanceprocessmonthWf 月计划明细
-     * @return 月计划明细集合
-     */
-    public List<AdsCstHywzqlcPdmmaintenanceprocessmonthWf> selectAdsCstHywzqlcPdmmaintenanceprocessmonthWfList(AdsCstHywzqlcPdmmaintenanceprocessmonthWfDTO adsCstHywzqlcPdmmaintenanceprocessmonthWf);
-
-    /**
-     * 新增月计划明细
-     *
-     * @param adsCstHywzqlcPdmmaintenanceprocessmonthWf 月计划明细
-     * @return 结果
-     */
-    public int insertAdsCstHywzqlcPdmmaintenanceprocessmonthWf(AdsCstHywzqlcPdmmaintenanceprocessmonthWf adsCstHywzqlcPdmmaintenanceprocessmonthWf);
-
-    /**
-     * 修改月计划明细
-     *
-     * @param adsCstHywzqlcPdmmaintenanceprocessmonthWf 月计划明细
-     * @return 结果
-     */
-    public int updateAdsCstHywzqlcPdmmaintenanceprocessmonthWf(AdsCstHywzqlcPdmmaintenanceprocessmonthWf adsCstHywzqlcPdmmaintenanceprocessmonthWf);
-
-    /**
-     * 删除月计划明细
-     *
-     * @param pkId 月计划明细主键
-     * @return 结果
-     */
-    public int deleteAdsCstHywzqlcPdmmaintenanceprocessmonthWfByPkId(String pkId);
-
-    /**
-     * 批量删除月计划明细
-     *
-     * @param pkIds 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteAdsCstHywzqlcPdmmaintenanceprocessmonthWfByPkIds(String[] pkIds);
-}

+ 62 - 0
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/IAdsCstHygszdbbPdmmaintenanceprocessmonthWfService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.powerdistribution.service;
+
+import java.util.List;
+import com.ruoyi.powerdistribution.domain.AdsCstHygszdbbPdmmaintenanceprocessmonthWf;
+import com.ruoyi.powerdistribution.domain.dto.AdsCstHygszdbbPdmmaintenanceprocessmonthWfDTO;
+
+/**
+ * 月计划明细Service接口
+ *
+ * @author ruoyi
+ * @date 2025-02-26
+ */
+public interface IAdsCstHygszdbbPdmmaintenanceprocessmonthWfService
+{
+    /**
+     * 查询月计划明细
+     *
+     * @param pkId 月计划明细主键
+     * @return 月计划明细
+     */
+    public AdsCstHygszdbbPdmmaintenanceprocessmonthWf selectAdsCstHygszdbbPdmmaintenanceprocessmonthWfByPkId(String pkId);
+
+    /**
+     * 查询月计划明细列表
+     *
+     * @param adsCstHygszdbbPdmmaintenanceprocessmonthWf 月计划明细
+     * @return 月计划明细集合
+     */
+    public List<AdsCstHygszdbbPdmmaintenanceprocessmonthWf> selectAdsCstHygszdbbPdmmaintenanceprocessmonthWfList(AdsCstHygszdbbPdmmaintenanceprocessmonthWfDTO adsCstHygszdbbPdmmaintenanceprocessmonthWf);
+
+    /**
+     * 新增月计划明细
+     *
+     * @param adsCstHygszdbbPdmmaintenanceprocessmonthWf 月计划明细
+     * @return 结果
+     */
+    public int insertAdsCstHygszdbbPdmmaintenanceprocessmonthWf(AdsCstHygszdbbPdmmaintenanceprocessmonthWf adsCstHygszdbbPdmmaintenanceprocessmonthWf);
+
+    /**
+     * 修改月计划明细
+     *
+     * @param adsCstHygszdbbPdmmaintenanceprocessmonthWf 月计划明细
+     * @return 结果
+     */
+    public int updateAdsCstHygszdbbPdmmaintenanceprocessmonthWf(AdsCstHygszdbbPdmmaintenanceprocessmonthWf adsCstHygszdbbPdmmaintenanceprocessmonthWf);
+
+    /**
+     * 批量删除月计划明细
+     *
+     * @param pkIds 需要删除的月计划明细主键集合
+     * @return 结果
+     */
+    public int deleteAdsCstHygszdbbPdmmaintenanceprocessmonthWfByPkIds(String[] pkIds);
+
+    /**
+     * 删除月计划明细信息
+     *
+     * @param pkId 月计划明细主键
+     * @return 结果
+     */
+    public int deleteAdsCstHygszdbbPdmmaintenanceprocessmonthWfByPkId(String pkId);
+}

+ 0 - 62
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/IAdsCstHywzqlcPdmmaintenanceprocessmonthWfService.java

@@ -1,62 +0,0 @@
-package com.ruoyi.powerdistribution.service;
-
-import java.util.List;
-import com.ruoyi.powerdistribution.domain.AdsCstHywzqlcPdmmaintenanceprocessmonthWf;
-import com.ruoyi.powerdistribution.domain.dto.AdsCstHywzqlcPdmmaintenanceprocessmonthWfDTO;
-
-/**
- * 月计划明细Service接口
- *
- * @author ruoyi
- * @date 2025-02-26
- */
-public interface IAdsCstHywzqlcPdmmaintenanceprocessmonthWfService
-{
-    /**
-     * 查询月计划明细
-     *
-     * @param pkId 月计划明细主键
-     * @return 月计划明细
-     */
-    public AdsCstHywzqlcPdmmaintenanceprocessmonthWf selectAdsCstHywzqlcPdmmaintenanceprocessmonthWfByPkId(String pkId);
-
-    /**
-     * 查询月计划明细列表
-     *
-     * @param adsCstHywzqlcPdmmaintenanceprocessmonthWf 月计划明细
-     * @return 月计划明细集合
-     */
-    public List<AdsCstHywzqlcPdmmaintenanceprocessmonthWf> selectAdsCstHywzqlcPdmmaintenanceprocessmonthWfList(AdsCstHywzqlcPdmmaintenanceprocessmonthWfDTO adsCstHywzqlcPdmmaintenanceprocessmonthWf);
-
-    /**
-     * 新增月计划明细
-     *
-     * @param adsCstHywzqlcPdmmaintenanceprocessmonthWf 月计划明细
-     * @return 结果
-     */
-    public int insertAdsCstHywzqlcPdmmaintenanceprocessmonthWf(AdsCstHywzqlcPdmmaintenanceprocessmonthWf adsCstHywzqlcPdmmaintenanceprocessmonthWf);
-
-    /**
-     * 修改月计划明细
-     *
-     * @param adsCstHywzqlcPdmmaintenanceprocessmonthWf 月计划明细
-     * @return 结果
-     */
-    public int updateAdsCstHywzqlcPdmmaintenanceprocessmonthWf(AdsCstHywzqlcPdmmaintenanceprocessmonthWf adsCstHywzqlcPdmmaintenanceprocessmonthWf);
-
-    /**
-     * 批量删除月计划明细
-     *
-     * @param pkIds 需要删除的月计划明细主键集合
-     * @return 结果
-     */
-    public int deleteAdsCstHywzqlcPdmmaintenanceprocessmonthWfByPkIds(String[] pkIds);
-
-    /**
-     * 删除月计划明细信息
-     *
-     * @param pkId 月计划明细主键
-     * @return 结果
-     */
-    public int deleteAdsCstHywzqlcPdmmaintenanceprocessmonthWfByPkId(String pkId);
-}

+ 97 - 0
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/impl/AdsCstHygszdbbPdmmaintenanceprocessmonthWfServiceImpl.java

@@ -0,0 +1,97 @@
+package com.ruoyi.powerdistribution.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.powerdistribution.domain.dto.AdsCstHygszdbbPdmmaintenanceprocessmonthWfDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.powerdistribution.mapper.AdsCstHygszdbbPdmmaintenanceprocessmonthWfMapper;
+import com.ruoyi.powerdistribution.domain.AdsCstHygszdbbPdmmaintenanceprocessmonthWf;
+import com.ruoyi.powerdistribution.service.IAdsCstHygszdbbPdmmaintenanceprocessmonthWfService;
+
+/**
+ * 月计划明细Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2025-02-26
+ */
+@Service
+public class AdsCstHygszdbbPdmmaintenanceprocessmonthWfServiceImpl implements IAdsCstHygszdbbPdmmaintenanceprocessmonthWfService
+{
+    @Autowired
+    private AdsCstHygszdbbPdmmaintenanceprocessmonthWfMapper adsCstHygszdbbPdmmaintenanceprocessmonthWfMapper;
+
+    /**
+     * 查询月计划明细
+     *
+     * @param pkId 月计划明细主键
+     * @return 月计划明细
+     */
+    @Override
+    public AdsCstHygszdbbPdmmaintenanceprocessmonthWf selectAdsCstHygszdbbPdmmaintenanceprocessmonthWfByPkId(String pkId)
+    {
+        return adsCstHygszdbbPdmmaintenanceprocessmonthWfMapper.selectAdsCstHygszdbbPdmmaintenanceprocessmonthWfByPkId(pkId);
+    }
+
+    /**
+     * 查询月计划明细列表
+     *
+     * @param adsCstHygszdbbPdmmaintenanceprocessmonthWf 月计划明细
+     * @return 月计划明细
+     */
+    @Override
+    public List<AdsCstHygszdbbPdmmaintenanceprocessmonthWf> selectAdsCstHygszdbbPdmmaintenanceprocessmonthWfList(AdsCstHygszdbbPdmmaintenanceprocessmonthWfDTO adsCstHygszdbbPdmmaintenanceprocessmonthWf)
+    {
+        return adsCstHygszdbbPdmmaintenanceprocessmonthWfMapper.selectAdsCstHygszdbbPdmmaintenanceprocessmonthWfList(adsCstHygszdbbPdmmaintenanceprocessmonthWf);
+    }
+
+    /**
+     * 新增月计划明细
+     *
+     * @param adsCstHygszdbbPdmmaintenanceprocessmonthWf 月计划明细
+     * @return 结果
+     */
+    @Override
+    public int insertAdsCstHygszdbbPdmmaintenanceprocessmonthWf(AdsCstHygszdbbPdmmaintenanceprocessmonthWf adsCstHygszdbbPdmmaintenanceprocessmonthWf)
+    {
+        adsCstHygszdbbPdmmaintenanceprocessmonthWf.setCreateTime(DateUtils.getNowDate());
+        return adsCstHygszdbbPdmmaintenanceprocessmonthWfMapper.insertAdsCstHygszdbbPdmmaintenanceprocessmonthWf(adsCstHygszdbbPdmmaintenanceprocessmonthWf);
+    }
+
+    /**
+     * 修改月计划明细
+     *
+     * @param adsCstHygszdbbPdmmaintenanceprocessmonthWf 月计划明细
+     * @return 结果
+     */
+    @Override
+    public int updateAdsCstHygszdbbPdmmaintenanceprocessmonthWf(AdsCstHygszdbbPdmmaintenanceprocessmonthWf adsCstHygszdbbPdmmaintenanceprocessmonthWf)
+    {
+        adsCstHygszdbbPdmmaintenanceprocessmonthWf.setUpdateTime(DateUtils.getNowDate());
+        return adsCstHygszdbbPdmmaintenanceprocessmonthWfMapper.updateAdsCstHygszdbbPdmmaintenanceprocessmonthWf(adsCstHygszdbbPdmmaintenanceprocessmonthWf);
+    }
+
+    /**
+     * 批量删除月计划明细
+     *
+     * @param pkIds 需要删除的月计划明细主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAdsCstHygszdbbPdmmaintenanceprocessmonthWfByPkIds(String[] pkIds)
+    {
+        return adsCstHygszdbbPdmmaintenanceprocessmonthWfMapper.deleteAdsCstHygszdbbPdmmaintenanceprocessmonthWfByPkIds(pkIds);
+    }
+
+    /**
+     * 删除月计划明细信息
+     *
+     * @param pkId 月计划明细主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAdsCstHygszdbbPdmmaintenanceprocessmonthWfByPkId(String pkId)
+    {
+        return adsCstHygszdbbPdmmaintenanceprocessmonthWfMapper.deleteAdsCstHygszdbbPdmmaintenanceprocessmonthWfByPkId(pkId);
+    }
+}

+ 0 - 97
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/impl/AdsCstHywzqlcPdmmaintenanceprocessmonthWfServiceImpl.java

@@ -1,97 +0,0 @@
-package com.ruoyi.powerdistribution.service.impl;
-
-import java.util.List;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.powerdistribution.domain.dto.AdsCstHywzqlcPdmmaintenanceprocessmonthWfDTO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.powerdistribution.mapper.AdsCstHywzqlcPdmmaintenanceprocessmonthWfMapper;
-import com.ruoyi.powerdistribution.domain.AdsCstHywzqlcPdmmaintenanceprocessmonthWf;
-import com.ruoyi.powerdistribution.service.IAdsCstHywzqlcPdmmaintenanceprocessmonthWfService;
-
-/**
- * 月计划明细Service业务层处理
- *
- * @author ruoyi
- * @date 2025-02-26
- */
-@Service
-public class AdsCstHywzqlcPdmmaintenanceprocessmonthWfServiceImpl implements IAdsCstHywzqlcPdmmaintenanceprocessmonthWfService
-{
-    @Autowired
-    private AdsCstHywzqlcPdmmaintenanceprocessmonthWfMapper adsCstHywzqlcPdmmaintenanceprocessmonthWfMapper;
-
-    /**
-     * 查询月计划明细
-     *
-     * @param pkId 月计划明细主键
-     * @return 月计划明细
-     */
-    @Override
-    public AdsCstHywzqlcPdmmaintenanceprocessmonthWf selectAdsCstHywzqlcPdmmaintenanceprocessmonthWfByPkId(String pkId)
-    {
-        return adsCstHywzqlcPdmmaintenanceprocessmonthWfMapper.selectAdsCstHywzqlcPdmmaintenanceprocessmonthWfByPkId(pkId);
-    }
-
-    /**
-     * 查询月计划明细列表
-     *
-     * @param adsCstHywzqlcPdmmaintenanceprocessmonthWf 月计划明细
-     * @return 月计划明细
-     */
-    @Override
-    public List<AdsCstHywzqlcPdmmaintenanceprocessmonthWf> selectAdsCstHywzqlcPdmmaintenanceprocessmonthWfList(AdsCstHywzqlcPdmmaintenanceprocessmonthWfDTO adsCstHywzqlcPdmmaintenanceprocessmonthWf)
-    {
-        return adsCstHywzqlcPdmmaintenanceprocessmonthWfMapper.selectAdsCstHywzqlcPdmmaintenanceprocessmonthWfList(adsCstHywzqlcPdmmaintenanceprocessmonthWf);
-    }
-
-    /**
-     * 新增月计划明细
-     *
-     * @param adsCstHywzqlcPdmmaintenanceprocessmonthWf 月计划明细
-     * @return 结果
-     */
-    @Override
-    public int insertAdsCstHywzqlcPdmmaintenanceprocessmonthWf(AdsCstHywzqlcPdmmaintenanceprocessmonthWf adsCstHywzqlcPdmmaintenanceprocessmonthWf)
-    {
-        adsCstHywzqlcPdmmaintenanceprocessmonthWf.setCreateTime(DateUtils.getNowDate());
-        return adsCstHywzqlcPdmmaintenanceprocessmonthWfMapper.insertAdsCstHywzqlcPdmmaintenanceprocessmonthWf(adsCstHywzqlcPdmmaintenanceprocessmonthWf);
-    }
-
-    /**
-     * 修改月计划明细
-     *
-     * @param adsCstHywzqlcPdmmaintenanceprocessmonthWf 月计划明细
-     * @return 结果
-     */
-    @Override
-    public int updateAdsCstHywzqlcPdmmaintenanceprocessmonthWf(AdsCstHywzqlcPdmmaintenanceprocessmonthWf adsCstHywzqlcPdmmaintenanceprocessmonthWf)
-    {
-        adsCstHywzqlcPdmmaintenanceprocessmonthWf.setUpdateTime(DateUtils.getNowDate());
-        return adsCstHywzqlcPdmmaintenanceprocessmonthWfMapper.updateAdsCstHywzqlcPdmmaintenanceprocessmonthWf(adsCstHywzqlcPdmmaintenanceprocessmonthWf);
-    }
-
-    /**
-     * 批量删除月计划明细
-     *
-     * @param pkIds 需要删除的月计划明细主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdsCstHywzqlcPdmmaintenanceprocessmonthWfByPkIds(String[] pkIds)
-    {
-        return adsCstHywzqlcPdmmaintenanceprocessmonthWfMapper.deleteAdsCstHywzqlcPdmmaintenanceprocessmonthWfByPkIds(pkIds);
-    }
-
-    /**
-     * 删除月计划明细信息
-     *
-     * @param pkId 月计划明细主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdsCstHywzqlcPdmmaintenanceprocessmonthWfByPkId(String pkId)
-    {
-        return adsCstHywzqlcPdmmaintenanceprocessmonthWfMapper.deleteAdsCstHywzqlcPdmmaintenanceprocessmonthWfByPkId(pkId);
-    }
-}

+ 16 - 16
ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/AdsCstHywzqlcPdmmaintenanceprocessmonthWfMapper.xml → ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/AdsCstHygszdbbPdmmaintenanceprocessmonthWfMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.powerdistribution.mapper.AdsCstHywzqlcPdmmaintenanceprocessmonthWfMapper">
+<mapper namespace="com.ruoyi.powerdistribution.mapper.AdsCstHygszdbbPdmmaintenanceprocessmonthWfMapper">
 
-    <resultMap type="AdsCstHywzqlcPdmmaintenanceprocessmonthWf" id="AdsCstHywzqlcPdmmaintenanceprocessmonthWfResult">
+    <resultMap type="AdsCstHygszdbbPdmmaintenanceprocessmonthWf" id="AdsCstHygszdbbPdmmaintenanceprocessmonthWfResult">
         <result property="pkId"    column="pk_id"    />
         <result property="mplanNo"    column="mplan_no"    />
         <result property="lineName"    column="line_name"    />
@@ -48,12 +48,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
-    <sql id="selectAdsCstHywzqlcPdmmaintenanceprocessmonthWfVo">
-        select pk_id, mplan_no, line_name, line_code, eqp_typ, eqp_typ_dsc, plan_ym, mplan_typ, start_tm, end_tm, cons_num, hour_num, work_org, work_org_nm, resp_dept, resp_dept_dsc, work_content, declare_tm, declare_pes, declare_org_no, declare_org_nm, mplan_st, mplan_st_dsc, org_no, org_nm, std_org_no, std_org_nm, std_city_org_no, std_city_org_nm, std_county_org_no, std_county_org_nm, is_maintenance, is_approve, maintenance_file_path, maintenance_file_name, approve_file_path, approve_file_name, create_by, create_time, update_by, update_time from ads_cst_hywzqlc_pdmmaintenanceprocessmonth_wf
+    <sql id="selectAdsCstHygszdbbPdmmaintenanceprocessmonthWfVo">
+        select pk_id, mplan_no, line_name, line_code, eqp_typ, eqp_typ_dsc, plan_ym, mplan_typ, start_tm, end_tm, cons_num, hour_num, work_org, work_org_nm, resp_dept, resp_dept_dsc, work_content, declare_tm, declare_pes, declare_org_no, declare_org_nm, mplan_st, mplan_st_dsc, org_no, org_nm, std_org_no, std_org_nm, std_city_org_no, std_city_org_nm, std_county_org_no, std_county_org_nm, is_maintenance, is_approve, maintenance_file_path, maintenance_file_name, approve_file_path, approve_file_name, create_by, create_time, update_by, update_time from ads_cst_hygszdbb_pdmmaintenanceprocessmonth_wf
     </sql>
 
-    <select id="selectAdsCstHywzqlcPdmmaintenanceprocessmonthWfList" parameterType="com.ruoyi.powerdistribution.domain.dto.AdsCstHywzqlcPdmmaintenanceprocessmonthWfDTO" resultMap="AdsCstHywzqlcPdmmaintenanceprocessmonthWfResult">
-        <include refid="selectAdsCstHywzqlcPdmmaintenanceprocessmonthWfVo"/>
+    <select id="selectAdsCstHygszdbbPdmmaintenanceprocessmonthWfList" parameterType="com.ruoyi.powerdistribution.domain.dto.AdsCstHygszdbbPdmmaintenanceprocessmonthWfDTO" resultMap="AdsCstHygszdbbPdmmaintenanceprocessmonthWfResult">
+        <include refid="selectAdsCstHygszdbbPdmmaintenanceprocessmonthWfVo"/>
         <where>
             <if test="mplanNo != null  and mplanNo != ''"> and mplan_no = #{mplanNo}</if>
             <if test="lineName != null  and lineName != ''"> and line_name like concat('%', #{lineName}, '%')</if>
@@ -101,13 +101,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectAdsCstHywzqlcPdmmaintenanceprocessmonthWfByPkId" parameterType="String" resultMap="AdsCstHywzqlcPdmmaintenanceprocessmonthWfResult">
-        <include refid="selectAdsCstHywzqlcPdmmaintenanceprocessmonthWfVo"/>
+    <select id="selectAdsCstHygszdbbPdmmaintenanceprocessmonthWfByPkId" parameterType="String" resultMap="AdsCstHygszdbbPdmmaintenanceprocessmonthWfResult">
+        <include refid="selectAdsCstHygszdbbPdmmaintenanceprocessmonthWfVo"/>
         where pk_id = #{pkId}
     </select>
 
-    <insert id="insertAdsCstHywzqlcPdmmaintenanceprocessmonthWf" parameterType="AdsCstHywzqlcPdmmaintenanceprocessmonthWf">
-        insert into ads_cst_hywzqlc_pdmmaintenanceprocessmonth_wf
+    <insert id="insertAdsCstHygszdbbPdmmaintenanceprocessmonthWf" parameterType="AdsCstHygszdbbPdmmaintenanceprocessmonthWf">
+        insert into ads_cst_hygszdbb_pdmmaintenanceprocessmonth_wf
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="pkId != null">pk_id,</if>
             <if test="mplanNo != null">mplan_no,</if>
@@ -196,8 +196,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="updateAdsCstHywzqlcPdmmaintenanceprocessmonthWf" parameterType="AdsCstHywzqlcPdmmaintenanceprocessmonthWf">
-        update ads_cst_hywzqlc_pdmmaintenanceprocessmonth_wf
+    <update id="updateAdsCstHygszdbbPdmmaintenanceprocessmonthWf" parameterType="AdsCstHygszdbbPdmmaintenanceprocessmonthWf">
+        update ads_cst_hygszdbb_pdmmaintenanceprocessmonth_wf
         <trim prefix="SET" suffixOverrides=",">
             <if test="mplanNo != null">mplan_no = #{mplanNo},</if>
             <if test="lineName != null">line_name = #{lineName},</if>
@@ -243,12 +243,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where pk_id = #{pkId}
     </update>
 
-    <delete id="deleteAdsCstHywzqlcPdmmaintenanceprocessmonthWfByPkId" parameterType="String">
-        delete from ads_cst_hywzqlc_pdmmaintenanceprocessmonth_wf where pk_id = #{pkId}
+    <delete id="deleteAdsCstHygszdbbPdmmaintenanceprocessmonthWfByPkId" parameterType="String">
+        delete from ads_cst_hygszdbb_pdmmaintenanceprocessmonth_wf where pk_id = #{pkId}
     </delete>
 
-    <delete id="deleteAdsCstHywzqlcPdmmaintenanceprocessmonthWfByPkIds" parameterType="String">
-        delete from ads_cst_hywzqlc_pdmmaintenanceprocessmonth_wf where pk_id in
+    <delete id="deleteAdsCstHygszdbbPdmmaintenanceprocessmonthWfByPkIds" parameterType="String">
+        delete from ads_cst_hygszdbb_pdmmaintenanceprocessmonth_wf where pk_id in
         <foreach item="pkId" collection="array" open="(" separator="," close=")">
             #{pkId}
         </foreach>

+ 1 - 1
ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmBranchLineMapper.xml

@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectPdmBranchLineVo">
         select id, big_feeder_branch_line_id, line_nm, eqp_no, run_no, blg_big_feeder_id, blg_big_feeder_nm, volt_lvl_cd, volt_lvl_dsc, erect_mode_cd, erect_mode_dsc, overhd_line_len, cable_line_len, line_tol_len, start_eqp_id, start_eqp_nm, start_eqp_typ_cd, start_eqp_typ_dsc, line_nature_cd, line_nature_dsc, blg_super_line_id, blg_super_line_nm, blg_city_id, blg_city_nm, op_maint_org_id, op_maint_org_nm, maint_team_id, maint_team_nm, run_st_cd, run_st_dsc, release_st_dsc, repmaint_line_len, is_have_figur, std_eqp_master_id, std_eqp_master_nm, ship_dt, std_org_no, std_org_nm, SUBSTRING_INDEX(std_city_org_nm, '国网湖南省电力有限公司', -1)std_city_org_nm , std_county_org_no, SUBSTRING_INDEX(std_county_org_nm, '国网湖南省电力有限公司', -1)std_county_org_nm, data_dt, etl_tm, std_city_org_no, start_pos, eqp_master_id, eqp_master_nm, battalion_id, battalion_nm, retrogres_dt, create_tm, latest_upd_tm,bouns as reward_amount,fault_free_duration
-        , (SELECT count(1) from ads_cst_hywzqlc_pdmstopbranchrecords_df t1 where t1.branch_line_id=t.big_feeder_branch_line_id and poweroff_start_tm > DATE_SUB(NOW(), INTERVAL 1 YEAR) )poweroff_num,
+        , (SELECT count(1) from ads_cst_hygszdbb_pdmstopbranchrecords_df t1 where t1.branch_line_id=t.big_feeder_branch_line_id and poweroff_start_tm > DATE_SUB(NOW(), INTERVAL 1 YEAR) )poweroff_num,
           t.fault_poweroff_tm,t.poweroff_tm
         from pdm_branch_line t
     </sql>

+ 5 - 5
ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmLineMapper.xml

@@ -191,7 +191,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         t1.maint_team_id, t1.maint_team_nm, t1.org_no, t1.org_nm, t1.std_creator_no, t1.std_creator_nm,
         t1.std_updator_no, t1.std_updator_nm, t1.std_org_no, t1.std_org_nm, t1.std_city_org_no,
         SUBSTRING_INDEX(t1.std_city_org_nm, '国网湖南省电力有限公司', -1)std_city_org_nm, t1.std_county_org_no, SUBSTRING_INDEX(t1.std_county_org_nm, '国网湖南省电力有限公司', -1) std_county_org_nm, t1.data_dt, t1.etl_tm,t1.bouns as reward_amount,t1.fault_free_duration,
-        (SELECT count(1) from ads_cst_hywzqlc_pdmstoprecords_df where poweroff_start_tm > DATE_SUB(NOW(), INTERVAL 1 YEAR ) and line_id=t1.rec_id)poweroff_num,
+        (SELECT count(1) from ads_cst_hygszdbb_pdmstoprecords_df where poweroff_start_tm > DATE_SUB(NOW(), INTERVAL 1 YEAR ) and line_id=t1.rec_id)poweroff_num,
         t1.fault_poweroff_tm,t1.poweroff_tm
         from pdm_line t1
         <where>
@@ -199,12 +199,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lineNm != null  and lineNm != ''"> and t1.line_nm like concat('%', #{lineNm}, '%')</if>
             <if test="branchLineNm != null  and branchLineNm != ''"> and exists(select 1 from pdm_branch_line b where b.blg_big_feeder_id=t1.feeder_id and b.line_nm like concat('%', #{branchLineNm}, '%'))</if>
             <if test="isMaintOverdue!=null and 'true'.toString() == isMaintOverdue.toString()">
-                and (EXISTS(SELECT 1 from ads_cst_hywzqlc_pdmstoprecords_df r where r.line_id=t1.rec_id and TIMESTAMPDIFF(YEAR,r.create_tm, SYSDATE())>3)
-                or (TIMESTAMPDIFF(YEAR,t1.ship_dt, SYSDATE())>3 and  not EXISTS(SELECT 1 from ads_cst_hywzqlc_pdmstoprecords_df r where r.line_id=t1.rec_id)))
+                and (EXISTS(SELECT 1 from ads_cst_hygszdbb_pdmstoprecords_df r where r.line_id=t1.rec_id and TIMESTAMPDIFF(YEAR,r.create_tm, SYSDATE())>3)
+                or (TIMESTAMPDIFF(YEAR,t1.ship_dt, SYSDATE())>3 and  not EXISTS(SELECT 1 from ads_cst_hygszdbb_pdmstoprecords_df r where r.line_id=t1.rec_id)))
            </if>
             <if test="isRepeatPoweroff!=null and 'true'.toString() == isRepeatPoweroff.toString()">
-                and EXISTS(SELECT 1 from ads_cst_hywzqlc_pdmstoprecords_df r where r.line_id=t1.rec_id and TIMESTAMPDIFF(MONTH,r.create_tm, SYSDATE())=2)
-                and (SELECT count(1) from ads_cst_hywzqlc_pdmstoprecords_df r where r.line_id=t1.rec_id )>=3
+                and EXISTS(SELECT 1 from ads_cst_hygszdbb_pdmstoprecords_df r where r.line_id=t1.rec_id and TIMESTAMPDIFF(MONTH,r.create_tm, SYSDATE())=2)
+                and (SELECT count(1) from ads_cst_hygszdbb_pdmstoprecords_df r where r.line_id=t1.rec_id )>=3
             </if>
         </where>
     </select>

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

@@ -43,15 +43,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectPdmMaintenanceProcessVo">
-        select id, plan_code,plan_code_w, power_outage_devices, per_hour_households_m, per_hour_households_w, SUBSTRING_INDEX(city, '国网湖南省电力有限公司', -1)city, SUBSTRING_INDEX(SUBSTRING_INDEX(county, '国网湖南省电力有限公司', -1),'国网衡阳供电公司',-1)county, SUBSTRING_INDEX(station, '国网湖南省电力有限公司', -1)station, line_code, line_name, per_hour_households_artif,SUBSTRING_INDEX(declar_agency, '国网衡阳供电公司', -1) declar_agency, is_maintenance, is_approve, maintenance_file_path,maintenance_file_name, approve_file_path,approve_file_name, create_by, create_time, update_by, update_time,std_org_no,week_start_dt,week_end_dt,std_county_org_no from ads_cst_hywzqlc_pdmmaintenanceprocess_wf
+        select id, plan_code,plan_code_w, power_outage_devices, per_hour_households_m, per_hour_households_w, SUBSTRING_INDEX(city, '国网湖南省电力有限公司', -1)city, SUBSTRING_INDEX(SUBSTRING_INDEX(county, '国网湖南省电力有限公司', -1),'国网衡阳供电公司',-1)county, SUBSTRING_INDEX(station, '国网湖南省电力有限公司', -1)station, line_code, line_name, per_hour_households_artif,SUBSTRING_INDEX(declar_agency, '国网衡阳供电公司', -1) declar_agency, is_maintenance, is_approve, maintenance_file_path,maintenance_file_name, approve_file_path,approve_file_name, create_by, create_time, update_by, update_time,std_org_no,week_start_dt,week_end_dt,std_county_org_no from ads_cst_hygszdbb_pdmmaintenanceprocess_wf
     </sql>
     <sql id="selectPdmMaintenanceProcessVo2">
         select (select ROUND(sum(hour_num),2)
-        from ads_cst_hywzqlc_pdmstoprecords_df r
+        from ads_cst_hygszdbb_pdmstoprecords_df r
         where SUBSTRING_INDEX(REPLACE(r.line_nm,' ',''),'10kV',-1)=SUBSTRING_INDEX(REPLACE(p.line_name,' ',''),'10kV',-1)
         and poweroff_nature_cd in('2111','2112','2121','2122','2141','2211','2212','2221','2231','2241')
         and DATE_FORMAT(poweroff_start_tm, '%Y-%m-%d') &gt;= week_start_dt
-        and DATE_FORMAT(poweroff_term_tm, '%Y-%m-%d') &lt;= week_end_dt)hour_num,id, plan_code,plan_code_w, power_outage_devices, per_hour_households_m, per_hour_households_w, SUBSTRING_INDEX(city, '国网湖南省电力有限公司', -1)city, SUBSTRING_INDEX(SUBSTRING_INDEX(county, '国网湖南省电力有限公司', -1),'国网衡阳供电公司',-1)county, SUBSTRING_INDEX(station, '国网湖南省电力有限公司', -1)station, line_code, line_name, per_hour_households_artif,SUBSTRING_INDEX(declar_agency, '国网衡阳供电公司', -1) declar_agency, is_maintenance, is_approve, maintenance_file_path,maintenance_file_name, approve_file_path,approve_file_name, create_by, create_time, update_by, update_time,std_org_no,week_start_dt,week_end_dt,std_county_org_no from ads_cst_hywzqlc_pdmmaintenanceprocess_wf p
+        and DATE_FORMAT(poweroff_term_tm, '%Y-%m-%d') &lt;= week_end_dt)hour_num,id, plan_code,plan_code_w, power_outage_devices, per_hour_households_m, per_hour_households_w, SUBSTRING_INDEX(city, '国网湖南省电力有限公司', -1)city, SUBSTRING_INDEX(SUBSTRING_INDEX(county, '国网湖南省电力有限公司', -1),'国网衡阳供电公司',-1)county, SUBSTRING_INDEX(station, '国网湖南省电力有限公司', -1)station, line_code, line_name, per_hour_households_artif,SUBSTRING_INDEX(declar_agency, '国网衡阳供电公司', -1) declar_agency, is_maintenance, is_approve, maintenance_file_path,maintenance_file_name, approve_file_path,approve_file_name, create_by, create_time, update_by, update_time,std_org_no,week_start_dt,week_end_dt,std_county_org_no from ads_cst_hygszdbb_pdmmaintenanceprocess_wf p
     </sql>
     <select id="selectPdmMaintenanceProcessList" parameterType="PdmMaintenanceProcess" resultMap="PdmMaintenanceProcessResult">
         select a.*,getExamiAmountFun(hour_num,per_hour_households_w) exami_Amount   from ( <include refid="selectPdmMaintenanceProcessVo2"/>
@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <insert id="insertPdmMaintenanceProcess" parameterType="PdmMaintenanceProcess" useGeneratedKeys="true" keyProperty="id">
-        insert into ads_cst_hywzqlc_pdmmaintenanceprocess_wf
+        insert into ads_cst_hygszdbb_pdmmaintenanceprocess_wf
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="planCode != null">plan_code,</if>
             <if test="powerOutageDevices != null">power_outage_devices,</if>
@@ -128,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updatePdmMaintenanceProcess" parameterType="PdmMaintenanceProcess">
-        update ads_cst_hywzqlc_pdmmaintenanceprocess_wf
+        update ads_cst_hygszdbb_pdmmaintenanceprocess_wf
         <trim prefix="SET" suffixOverrides=",">
             <if test="planCode != null">plan_code = #{planCode},</if>
             <if test="powerOutageDevices != null">power_outage_devices = #{powerOutageDevices},</if>
@@ -156,11 +156,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deletePdmMaintenanceProcessById" parameterType="Long">
-        delete from ads_cst_hywzqlc_pdmmaintenanceprocess_wf where id = #{id}
+        delete from ads_cst_hygszdbb_pdmmaintenanceprocess_wf where id = #{id}
     </delete>
 
     <delete id="deletePdmMaintenanceProcessByIds" parameterType="String">
-        delete from ads_cst_hywzqlc_pdmmaintenanceprocess_wf where id in
+        delete from ads_cst_hygszdbb_pdmmaintenanceprocess_wf where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

+ 9 - 9
ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmReportAppointmentDayMapper.xml

@@ -154,7 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 sum(if((to_post_in_place_person_pos_lvl_no in ('3019007','3019008','3019009') and is_in_place = '1'),1,0)) manage_sum,
                 sum(if(is_in_place = '0',1,0)) absent_sum,
                 submit_org_nm
-            from ads_cst_hywzqlc_pdmworkplaninplace_df t1,ads_cst_hywzqlc_pdmworkplan_df t2 where
+            from ads_cst_hygszdbb_pdmworkplaninplace_df t1,ads_cst_hygszdbb_pdmworkplan_df t2 where
                 t2.uuid = t1.relation_id
                 and date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate} and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
             GROUP BY submit_org_nm
@@ -163,7 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN(
             select submit_org_nm,
             GROUP_CONCAT(to_post_in_place_person_nm,';') AS absent_detail FROM
-                ads_cst_hywzqlc_pdmworkplaninplace_df t1,ads_cst_hywzqlc_pdmworkplan_df t2 where
+                ads_cst_hygszdbb_pdmworkplaninplace_df t1,ads_cst_hygszdbb_pdmworkplan_df t2 where
                 t2.uuid = t1.relation_id and is_in_place = '0'
                 and date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate} and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}                                                                                                              and date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate} and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
             GROUP BY submit_org_nm
@@ -173,9 +173,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             select sum(1) absent_bad_sum,
                    GROUP_CONCAT(t1.to_post_in_place_person_nm,';') AS absent_bad_detail,
                    submit_org_nm
-            from  ads_cst_hywzqlc_pdmworkplaninplace_df t1,ads_cst_hywzqlc_pdmworkplan_df t2 where
+            from  ads_cst_hygszdbb_pdmworkplaninplace_df t1,ads_cst_hygszdbb_pdmworkplan_df t2 where
                 t2.uuid = t1.relation_id and t1.is_safe_resumption = '0'
-                and EXISTS(select 1 from ads_cst_hywzqlc_pdminspectionrecords_df t3 where t3.day_op_info_id = t2.uuid and t3.scene_rating_cd!='2018002')
+                and EXISTS(select 1 from ads_cst_hygszdbb_pdminspectionrecords_df t3 where t3.day_op_info_id = t2.uuid and t3.scene_rating_cd!='2018002')
                 and date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate} and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
             GROUP BY submit_org_nm
         )tt3 on t1.organ_name = tt3.submit_org_nm
@@ -187,7 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 sum(if(scene_rating_cd !='2018002',1,0)) problem_sum,
                 sum(if(scene_rating_cd !='2018002' and audit_lvl_cd = '2025002',1,0)) city_check_sum,
                 submit_org_nm
-            from ads_cst_hywzqlc_pdminspectionrecords_df t1,ads_cst_hywzqlc_pdmworkplan_df t2 where
+            from ads_cst_hygszdbb_pdminspectionrecords_df t1,ads_cst_hygszdbb_pdmworkplan_df t2 where
                 t2.uuid = t1.day_op_info_id
                 and date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate} and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
             GROUP BY submit_org_nm
@@ -212,15 +212,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
               sum(if((to_post_in_place_person_pos_lvl_no in ('3019014','3019015','3019016') and is_in_place = '1'),1,0)) boss_sum,
               sum(if((to_post_in_place_person_pos_lvl_no in ('3019007','3019008','3019009') and is_in_place = '1'),1,0)) manage_sum,
               sum(if(is_in_place = '0',1,0)) absent_sum
-              from ads_cst_hywzqlc_pdmworkplaninplace_df t1,ads_cst_hywzqlc_pdmworkplan_df t2 where
+              from ads_cst_hygszdbb_pdmworkplaninplace_df t1,ads_cst_hygszdbb_pdmworkplan_df t2 where
                   t2.uuid = t1.relation_id
                  and date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate} and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
              ) ttt1,
             (select sum(1) absent_bad_sum,
             GROUP_CONCAT(to1.to_post_in_place_person_nm,';') AS absent_bad_detail
-            from  ads_cst_hywzqlc_pdmworkplaninplace_df to1,ads_cst_hywzqlc_pdmworkplan_df to2 where
+            from  ads_cst_hygszdbb_pdmworkplaninplace_df to1,ads_cst_hygszdbb_pdmworkplan_df to2 where
             to2.uuid = to1.relation_id and to1.is_safe_resumption = '0'
-            and EXISTS(select 1 from ads_cst_hywzqlc_pdminspectionrecords_df to3 where to3.day_op_info_id = to2.uuid and to3.scene_rating_cd!='2018002')
+            and EXISTS(select 1 from ads_cst_hygszdbb_pdminspectionrecords_df to3 where to3.day_op_info_id = to2.uuid and to3.scene_rating_cd!='2018002')
             and date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate} and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
             )ttt2,
              (select
@@ -229,7 +229,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
              sum(if(op_risk_cd ='2007005' ,1,0)) check_num5,
              sum(if(scene_rating_cd !='2018002',1,0)) problem_sum,
              sum(if(scene_rating_cd !='2018002' and audit_lvl_cd = '2025002',1,0)) city_check_sum
-             from ads_cst_hywzqlc_pdminspectionrecords_df t1,ads_cst_hywzqlc_pdmworkplan_df t2 where
+             from ads_cst_hygszdbb_pdminspectionrecords_df t1,ads_cst_hygszdbb_pdmworkplan_df t2 where
              t2.uuid = t1.day_op_info_id
              and date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate} and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
              ) ttt3

+ 4 - 4
ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmReportIllegalDayMapper.xml

@@ -159,14 +159,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(if((t3.audit_lvl_cd='2025002' and t2.break_rules_nature_cd = '2020001'),1,0)) city_num2,
         sum(if((t3.audit_lvl_cd='2025003' and t2.break_rules_nature_cd = '2020002'),1,0)) county_num1,
         sum(if((t3.audit_lvl_cd='2025003' and t2.break_rules_nature_cd = '2020001'),1,0)) county_num2,
-        t4.submit_org_nm from ads_cst_hywzqlc_pdmviolationrecords_df t2,ads_cst_hywzqlc_pdminspectionrecords_df t3,ads_cst_hywzqlc_pdmworkplan_df t4
+        t4.submit_org_nm from ads_cst_hygszdbb_pdmviolationrecords_df t2,ads_cst_hygszdbb_pdminspectionrecords_df t3,ads_cst_hygszdbb_pdmworkplan_df t4
         where t2.audit_rec_id  = t3.audit_rec_id and t2.day_op_info_id = t4.uuid
         and date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate} and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
         GROUP BY t4.submit_org_nm
         ) t on t1.organ_name = t.submit_org_nm
         LEFT JOIN
         (
-        select count(1) check_num,t2.submit_org_nm from ads_cst_hywzqlc_pdminspectionproblemrecords_df t1,ads_cst_hywzqlc_pdmworkplan_df t2
+        select count(1) check_num,t2.submit_org_nm from ads_cst_hygszdbb_pdminspectionproblemrecords_df t1,ads_cst_hygszdbb_pdmworkplan_df t2
         where t1.day_op_info_id = t2.uuid and t1.delete_mark  = '0'
         and date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate} and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
         GROUP BY t2.submit_org_nm
@@ -191,11 +191,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(if((t3.audit_lvl_cd='2025002' and t2.break_rules_nature_cd = '2020001'),1,0)) city_num2,
         sum(if((t3.audit_lvl_cd='2025003' and t2.break_rules_nature_cd = '2020002'),1,0)) county_num1,
         sum(if((t3.audit_lvl_cd='2025003' and t2.break_rules_nature_cd = '2020001'),1,0)) county_num2
-        from ads_cst_hywzqlc_pdmviolationrecords_df t2,ads_cst_hywzqlc_pdminspectionrecords_df t3,ads_cst_hywzqlc_pdmworkplan_df t4
+        from ads_cst_hygszdbb_pdmviolationrecords_df t2,ads_cst_hygszdbb_pdminspectionrecords_df t3,ads_cst_hygszdbb_pdmworkplan_df t4
         where t2.audit_rec_id  = t3.audit_rec_id and t2.day_op_info_id = t4.uuid
         and date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate} and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
         )total_1,
-        (select count(1) check_num from ads_cst_hywzqlc_pdminspectionproblemrecords_df t1,ads_cst_hywzqlc_pdmworkplan_df t2
+        (select count(1) check_num from ads_cst_hygszdbb_pdminspectionproblemrecords_df t1,ads_cst_hygszdbb_pdmworkplan_df t2
         where t1.day_op_info_id = t2.uuid and t1.delete_mark  = '0'
         and date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate} and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
         )total_2

+ 2 - 2
ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmReportPlanDayMapper.xml

@@ -168,7 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(if((plan_typ_cd = '2028002' and plan_exec_st_cd = '2029005'),1,0)) temporary_cancel_sum,
         submit_org_nm
         from
-        ads_cst_hywzqlc_pdmworkplan_df
+        ads_cst_hygszdbb_pdmworkplan_df
         where
             date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate}
           and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
@@ -185,7 +185,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                IFNULL(CONCAT(round(sum(if((plan_typ_cd = '2028002' and plan_exec_st_cd != '2029005'),1,0))/sum(if(plan_typ_cd = '2028002',1,0))*100,2),'%'),'0.00%')  temporary_ratio,
                IFNULL(CONCAT(round(sum(if((plan_typ_cd = '2028002' and plan_exec_st_cd = '2029005'),1,0))/sum(1)*100,2),'%'),'0.00%')  temporary_plan_ratio
         from
-            ads_cst_hywzqlc_pdmworkplan_df
+            ads_cst_hygszdbb_pdmworkplan_df
         where
         date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate}
         and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}

+ 3 - 3
ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmReportPlanNextDayMapper.xml

@@ -206,7 +206,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 sum(if(op_risk_lvl_cd = '2007005',1,0)) plan_leve5,
                 submit_org_nm
             from
-                ads_cst_hywzqlc_pdmworkplan_df
+                ads_cst_hygszdbb_pdmworkplan_df
             where  date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate}
               and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
             GROUP BY submit_org_nm
@@ -215,7 +215,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  select GROUP_CONCAT(check_detail) check_detail,submit_org_nm from(
                         select CONCAT(subs_or_line_nm,'(',count(1),'个作业面)') check_detail,
                                submit_org_nm from
-                            ads_cst_hywzqlc_pdmworkplan_df where volt_lvl_cd=  '2001008' and op_typ_cd != '2002001'
+                            ads_cst_hygszdbb_pdmworkplan_df where volt_lvl_cd=  '2001008' and op_typ_cd != '2002001'
                          and date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate}
                          and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
                         GROUP BY submit_org_nm,subs_or_line_nm
@@ -238,7 +238,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                IFNULL(sum(if(op_risk_lvl_cd = '2007005',1,0)),0) plan_leve5,
                '' check_detail
         from
-        ads_cst_hywzqlc_pdmworkplan_df
+        ads_cst_hygszdbb_pdmworkplan_df
         where  date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate}
         and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
 

+ 6 - 6
ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmScoreRankManagerMapper.xml

@@ -128,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(if(op_risk_lvl_cd = '2007003',1,0))*2 work_level_3,
         sum(if(op_risk_lvl_cd = '2007004',1,0))*1 work_level_4,
         sum(if(op_risk_lvl_cd = '2007005',1,0))*0.5 work_level_5
-        from ads_cst_hywzqlc_pdmworkplan_df
+        from ads_cst_hygszdbb_pdmworkplan_df
         where date_format(plan_start_wk_tm,'%Y%m%d')  &gt;= #{startDate}
         and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
         and work_team_nm not like '%公司'
@@ -142,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(if(t2.scene_rating_cd = '2018004' and audit_lvl_cd ='2025002' and break_rules_nature_cd = '2020001',1,0))*6 city_violation_1,
         sum(if(t2.scene_rating_cd = '2018004' and audit_lvl_cd ='2025002' and break_rules_nature_cd in ('2020002','2020003','2020004','2020005','2020006'),1,0))*2 city_violation_2
         from
-        ads_cst_hywzqlc_pdmviolationrecords_df t1,ads_cst_hywzqlc_pdminspectionrecords_df t2,ads_cst_hywzqlc_pdmworkplan_df t3
+        ads_cst_hygszdbb_pdmviolationrecords_df t1,ads_cst_hygszdbb_pdminspectionrecords_df t2,ads_cst_hygszdbb_pdmworkplan_df t3
         where t1.audit_rec_id = t2.audit_rec_id and t1.day_op_info_id = t3.uuid
         and work_team_nm not like '%公司'
         and date_format(plan_start_wk_tm,'%Y%m%d')  &gt;= #{startDate}
@@ -155,7 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(if(t2.scene_rating_cd = '2018003' and audit_lvl_cd ='2025002' and t1.problem_level in('2070004','2070005','2070006','2070007'),1,0))*3 city_problem_1,
         sum(if(t2.scene_rating_cd = '2018003' and audit_lvl_cd ='2025002' and t1.problem_level = '2070001',1,0))*1 city_problem_2
         from
-        ads_cst_hywzqlc_pdminspectionproblemrecords_df t1,ads_cst_hywzqlc_pdminspectionrecords_df t2,ads_cst_hywzqlc_pdmworkplan_df t3
+        ads_cst_hygszdbb_pdminspectionproblemrecords_df t1,ads_cst_hygszdbb_pdminspectionrecords_df t2,ads_cst_hygszdbb_pdmworkplan_df t3
         where t1.day_op_info_id = t2.day_op_info_id and  t2.day_op_info_id = t3.uuid
         and work_team_nm not like '%公司'
         and date_format(plan_start_wk_tm,'%Y%m%d')  &gt;= #{startDate}
@@ -179,7 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(if(op_risk_lvl_cd = '2007003',1,0))*2 work_level_3,
         sum(if(op_risk_lvl_cd = '2007004',1,0))*1 work_level_4,
         sum(if(op_risk_lvl_cd = '2007005',1,0))*0.5 work_level_5
-        from ads_cst_hywzqlc_pdmworkplan_df
+        from ads_cst_hygszdbb_pdmworkplan_df
         where date_format(plan_start_wk_tm,'%Y%m%d')  &gt;= #{startDate}
           and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
         and work_team_nm like '%公司' and work_team_nm not like '%雁能%'
@@ -193,7 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(if(t2.scene_rating_cd = '2018004' and audit_lvl_cd ='2025002' and break_rules_nature_cd = '2020001',1,0))*6 city_violation_1,
         sum(if(t2.scene_rating_cd = '2018004' and audit_lvl_cd ='2025002' and break_rules_nature_cd in ('2020002','2020003','2020004','2020005','2020006'),1,0))*2 city_violation_2
         from
-        ads_cst_hywzqlc_pdmviolationrecords_df t1,ads_cst_hywzqlc_pdminspectionrecords_df t2,ads_cst_hywzqlc_pdmworkplan_df t3
+        ads_cst_hygszdbb_pdmviolationrecords_df t1,ads_cst_hygszdbb_pdminspectionrecords_df t2,ads_cst_hygszdbb_pdmworkplan_df t3
         where t1.audit_rec_id = t2.audit_rec_id and t1.day_op_info_id = t3.uuid
         and work_team_nm like '%公司' and work_team_nm not like '%雁能%'
         and date_format(plan_start_wk_tm,'%Y%m%d')  &gt;= #{startDate}
@@ -206,7 +206,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(if(t2.scene_rating_cd = '2018003' and audit_lvl_cd ='2025002' and t1.problem_level in('2070004','2070005','2070006','2070007'),1,0))*3 city_problem_1,
         sum(if(t2.scene_rating_cd = '2018003' and audit_lvl_cd ='2025002' and t1.problem_level = '2070001',1,0))*1 city_problem_2
         from
-        ads_cst_hywzqlc_pdminspectionproblemrecords_df t1,ads_cst_hywzqlc_pdminspectionrecords_df t2,ads_cst_hywzqlc_pdmworkplan_df t3
+        ads_cst_hygszdbb_pdminspectionproblemrecords_df t1,ads_cst_hygszdbb_pdminspectionrecords_df t2,ads_cst_hygszdbb_pdmworkplan_df t3
         where t1.day_op_info_id = t2.day_op_info_id and  t2.day_op_info_id = t3.uuid
         and work_team_nm like '%公司' and work_team_nm not like '%雁能%'
         and date_format(plan_start_wk_tm,'%Y%m%d')  &gt;= #{startDate}

+ 6 - 6
ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmScoreRankTeamMapper.xml

@@ -122,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(if(op_risk_lvl_cd = '2007003',1,0))*2 work_level_3,
         sum(if(op_risk_lvl_cd = '2007004',1,0))*1 work_level_4,
         sum(if(op_risk_lvl_cd = '2007005',1,0))*0.5 work_level_5
-        from ads_cst_hywzqlc_pdmworkplan_df
+        from ads_cst_hygszdbb_pdmworkplan_df
         where date_format(plan_start_wk_tm,'%Y%m%d')  &gt;= #{startDate}
         and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
         and work_team_nm not like '%公司'
@@ -136,7 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(if(t2.scene_rating_cd = '2018004' and audit_lvl_cd ='2025002' and break_rules_nature_cd = '2020001',1,0))*6 city_violation_1,
         sum(if(t2.scene_rating_cd = '2018004' and audit_lvl_cd ='2025002' and break_rules_nature_cd in ('2020002','2020003','2020004','2020005','2020006'),1,0))*2 city_violation_2
         from
-        ads_cst_hywzqlc_pdmviolationrecords_df t1,ads_cst_hywzqlc_pdminspectionrecords_df t2,ads_cst_hywzqlc_pdmworkplan_df t3
+        ads_cst_hygszdbb_pdmviolationrecords_df t1,ads_cst_hygszdbb_pdminspectionrecords_df t2,ads_cst_hygszdbb_pdmworkplan_df t3
         where t1.audit_rec_id = t2.audit_rec_id and t1.day_op_info_id = t3.uuid
         and  work_team_nm not like '%公司'
         and date_format(plan_start_wk_tm,'%Y%m%d')  &gt;= #{startDate}
@@ -149,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(if(t2.scene_rating_cd = '2018003' and audit_lvl_cd ='2025002' and t1.problem_level in('2070004','2070005','2070006','2070007'),1,0))*3 city_problem_1,
         sum(if(t2.scene_rating_cd = '2018003' and audit_lvl_cd ='2025002' and t1.problem_level = '2070001',1,0))*1 city_problem_2
         from
-        ads_cst_hywzqlc_pdminspectionproblemrecords_df t1,ads_cst_hywzqlc_pdminspectionrecords_df t2,ads_cst_hywzqlc_pdmworkplan_df t3
+        ads_cst_hygszdbb_pdminspectionproblemrecords_df t1,ads_cst_hygszdbb_pdminspectionrecords_df t2,ads_cst_hygszdbb_pdmworkplan_df t3
         where t1.day_op_info_id = t2.day_op_info_id and  t2.day_op_info_id = t3.uuid
         and  work_team_nm not like '%公司'
         and date_format(plan_start_wk_tm,'%Y%m%d')  &gt;= #{startDate}
@@ -173,7 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(if(op_risk_lvl_cd = '2007003',1,0))*2 work_level_3,
         sum(if(op_risk_lvl_cd = '2007004',1,0))*1 work_level_4,
         sum(if(op_risk_lvl_cd = '2007005',1,0))*0.5 work_level_5
-        from ads_cst_hywzqlc_pdmworkplan_df
+        from ads_cst_hygszdbb_pdmworkplan_df
         where work_team_nm like '%公司' and work_team_nm not like '%雁能%'
         and date_format(plan_start_wk_tm,'%Y%m%d')  &gt;= #{startDate}
         and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
@@ -187,7 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(if(t2.scene_rating_cd = '2018004' and audit_lvl_cd ='2025002' and break_rules_nature_cd = '2020001',1,0))*6 city_violation_1,
         sum(if(t2.scene_rating_cd = '2018004' and audit_lvl_cd ='2025002' and break_rules_nature_cd in ('2020002','2020003','2020004','2020005','2020006'),1,0))*2 city_violation_2
         from
-        ads_cst_hywzqlc_pdmviolationrecords_df t1,ads_cst_hywzqlc_pdminspectionrecords_df t2,ads_cst_hywzqlc_pdmworkplan_df t3
+        ads_cst_hygszdbb_pdmviolationrecords_df t1,ads_cst_hygszdbb_pdminspectionrecords_df t2,ads_cst_hygszdbb_pdmworkplan_df t3
         where t1.audit_rec_id = t2.audit_rec_id and t1.day_op_info_id = t3.uuid
         and work_team_nm like '%公司' and work_team_nm not like '%雁能%'
         and date_format(plan_start_wk_tm,'%Y%m%d')  &gt;= #{startDate}
@@ -200,7 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(if(t2.scene_rating_cd = '2018003' and audit_lvl_cd ='2025002' and t1.problem_level in('2070004','2070005','2070006','2070007'),1,0))*3 city_problem_1,
         sum(if(t2.scene_rating_cd = '2018003' and audit_lvl_cd ='2025002' and t1.problem_level = '2070001',1,0))*1 city_problem_2
         from
-        ads_cst_hywzqlc_pdminspectionproblemrecords_df t1,ads_cst_hywzqlc_pdminspectionrecords_df t2,ads_cst_hywzqlc_pdmworkplan_df t3
+        ads_cst_hygszdbb_pdminspectionproblemrecords_df t1,ads_cst_hygszdbb_pdminspectionrecords_df t2,ads_cst_hygszdbb_pdmworkplan_df t3
         where t1.day_op_info_id = t2.day_op_info_id and  t2.day_op_info_id = t3.uuid
         and work_team_nm like '%公司' and work_team_nm not like '%雁能%'
         and date_format(plan_start_wk_tm,'%Y%m%d')  &gt;= #{startDate}

+ 6 - 6
ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmScoreRankWorkerMapper.xml

@@ -145,7 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(if(op_risk_lvl_cd = '2007003',1,0))*2*0.3 work_level_3,
         sum(if(op_risk_lvl_cd = '2007004',1,0))*1*0.3 work_level_4,
         sum(if(op_risk_lvl_cd = '2007005',1,0))*0.5*0.3 work_level_5
-        from ads_cst_hywzqlc_pdmworkplan_df t1,ads_cst_hywzqlc_pdmworkplanworker_df t2
+        from ads_cst_hygszdbb_pdmworkplan_df t1,ads_cst_hygszdbb_pdmworkplanworker_df t2
         where t1.uuid =t2.op_plan_id
         AND date_format(plan_start_wk_tm,'%Y%m%d')  &gt;= #{startDate}
         and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
@@ -160,7 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(if(t2.scene_rating_cd = '2018004' and audit_lvl_cd ='2025002' and break_rules_nature_cd = '2020001',1,0))*6*0.3 city_violation_1,
         sum(if(t2.scene_rating_cd = '2018004' and audit_lvl_cd ='2025002' and break_rules_nature_cd in ('2020002','2020003','2020004','2020005','2020006'),1,0))*2*0.3 city_violation_2
         from
-        ads_cst_hywzqlc_pdmviolationrecords_df t1,ads_cst_hywzqlc_pdminspectionrecords_df t2,ads_cst_hywzqlc_pdmworkplan_df t3,ads_cst_hywzqlc_pdmworkplanworker_df t4
+        ads_cst_hygszdbb_pdmviolationrecords_df t1,ads_cst_hygszdbb_pdminspectionrecords_df t2,ads_cst_hygszdbb_pdmworkplan_df t3,ads_cst_hygszdbb_pdmworkplanworker_df t4
         where t1.audit_rec_id = t2.audit_rec_id and t1.day_op_info_id = t3.uuid and t3.uuid =t4.op_plan_id
         and work_team_nm not like '%公司'
         and date_format(plan_start_wk_tm,'%Y%m%d')  &gt;= #{startDate}
@@ -173,7 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(if(t2.scene_rating_cd = '2018003' and audit_lvl_cd ='2025002' and t1.problem_level in('2070004','2070005','2070006','2070007'),1,0))*3*0.3 city_problem_1,
         sum(if(t2.scene_rating_cd = '2018003' and audit_lvl_cd ='2025002' and t1.problem_level = '2070001',1,0))*1*0.3 city_problem_2
         from
-        ads_cst_hywzqlc_pdminspectionproblemrecords_df t1,ads_cst_hywzqlc_pdminspectionrecords_df t2,ads_cst_hywzqlc_pdmworkplan_df t3,ads_cst_hywzqlc_pdmworkplanworker_df t4
+        ads_cst_hygszdbb_pdminspectionproblemrecords_df t1,ads_cst_hygszdbb_pdminspectionrecords_df t2,ads_cst_hygszdbb_pdmworkplan_df t3,ads_cst_hygszdbb_pdmworkplanworker_df t4
         where t1.day_op_info_id = t2.day_op_info_id and  t2.day_op_info_id = t3.uuid and t3.uuid =t4.op_plan_id
         and work_team_nm not like '%公司'
         and date_format(plan_start_wk_tm,'%Y%m%d')  &gt;= #{startDate}
@@ -197,7 +197,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(if(op_risk_lvl_cd = '2007003',1,0))*2*0.3 work_level_3,
         sum(if(op_risk_lvl_cd = '2007004',1,0))*1*0.3 work_level_4,
         sum(if(op_risk_lvl_cd = '2007005',1,0))*0.5*0.3 work_level_5
-        from ads_cst_hywzqlc_pdmworkplan_df t1,ads_cst_hywzqlc_pdmworkplanworker_df t2
+        from ads_cst_hygszdbb_pdmworkplan_df t1,ads_cst_hygszdbb_pdmworkplanworker_df t2
         where t1.uuid =t2.op_plan_id
         and date_format(plan_start_wk_tm,'%Y%m%d')  &gt;= #{startDate}
         and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
@@ -212,7 +212,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(if(t2.scene_rating_cd = '2018004' and audit_lvl_cd ='2025002' and break_rules_nature_cd = '2020001',1,0))*6*0.3 city_violation_1,
         sum(if(t2.scene_rating_cd = '2018004' and audit_lvl_cd ='2025002' and break_rules_nature_cd in ('2020002','2020003','2020004','2020005','2020006'),1,0))*2*0.3 city_violation_2
         from
-        ads_cst_hywzqlc_pdmviolationrecords_df t1,ads_cst_hywzqlc_pdminspectionrecords_df t2,ads_cst_hywzqlc_pdmworkplan_df t3,ads_cst_hywzqlc_pdmworkplanworker_df t4
+        ads_cst_hygszdbb_pdmviolationrecords_df t1,ads_cst_hygszdbb_pdminspectionrecords_df t2,ads_cst_hygszdbb_pdmworkplan_df t3,ads_cst_hygszdbb_pdmworkplanworker_df t4
         where t1.audit_rec_id = t2.audit_rec_id and t1.day_op_info_id = t3.uuid and t3.uuid =t4.op_plan_id
         and work_team_nm like '%公司' and work_team_nm not like '%雁能%'
         and date_format(plan_start_wk_tm,'%Y%m%d')  &gt;= #{startDate}
@@ -225,7 +225,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(if(t2.scene_rating_cd = '2018003' and audit_lvl_cd ='2025002' and t1.problem_level in('2070004','2070005','2070006','2070007'),1,0))*3*0.3 city_problem_1,
         sum(if(t2.scene_rating_cd = '2018003' and audit_lvl_cd ='2025002' and t1.problem_level = '2070001',1,0))*1*0.3 city_problem_2
         from
-        ads_cst_hywzqlc_pdminspectionproblemrecords_df t1,ads_cst_hywzqlc_pdminspectionrecords_df t2,ads_cst_hywzqlc_pdmworkplan_df t3,ads_cst_hywzqlc_pdmworkplanworker_df t4
+        ads_cst_hygszdbb_pdminspectionproblemrecords_df t1,ads_cst_hygszdbb_pdminspectionrecords_df t2,ads_cst_hygszdbb_pdmworkplan_df t3,ads_cst_hygszdbb_pdmworkplanworker_df t4
         where t1.day_op_info_id = t2.day_op_info_id and  t2.day_op_info_id = t3.uuid and t3.uuid =t4.op_plan_id
         and work_team_nm like '%公司' and work_team_nm not like '%雁能%'
         and date_format(plan_start_wk_tm,'%Y%m%d')  &gt;= #{startDate}

Plik diff jest za duży
+ 0 - 0
ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmStopRecordsMapper.xml


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

@@ -429,7 +429,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SUM(IF((poweroff_nature_cd in('1101','1202') and SUBSTRING(data_dt,5,2)='10'),poweroff_duration_tm,0)) as error_stop_month_10_actual,
         SUM(IF((poweroff_nature_cd in('1101','1202') and SUBSTRING(data_dt,5,2)='11'),poweroff_duration_tm,0)) as error_stop_month_11_actual,
         SUM(IF((poweroff_nature_cd in('1101','1202') and SUBSTRING(data_dt,5,2)='12'),poweroff_duration_tm,0)) as error_stop_month_12_actual
-        from ads_cst_hywzqlc_pdmstoprecords_df
+        from ads_cst_hygszdbb_pdmstoprecords_df
         where SUBSTRING(data_dt,1,4) = #{reportYear}
         GROUP BY substr(duty_dept_no,2,12)
 
@@ -476,7 +476,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        SUM(IF((poweroff_nature_cd in('1101','1202') and SUBSTRING(data_dt,5,2)='10'),poweroff_duration_tm,0)) as error_stop_month_10_actual,
        SUM(IF((poweroff_nature_cd in('1101','1202') and SUBSTRING(data_dt,5,2)='11'),poweroff_duration_tm,0)) as error_stop_month_11_actual,
        SUM(IF((poweroff_nature_cd in('1101','1202') and SUBSTRING(data_dt,5,2)='12'),poweroff_duration_tm,0)) as error_stop_month_12_actual
-        from ads_cst_hywzqlc_pdmstoprecords_df
+        from ads_cst_hygszdbb_pdmstoprecords_df
         where SUBSTRING(data_dt,1,4) = #{reportYear}
         ) t2 on t1.company_no = t2.org_no
         where  report_year = #{reportYear}

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

@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                ring_cabinet_plan_qt, IFNULL(ring_cabinet_accu_qt,0) ring_cabinet_accu_qt,
                pole_tab_plan_qt, IFNULL(pole_tab_accu_qt,0) 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
+        from ads_cst_hygszdbb_pdmworkcomplestatistics_wf
     </sql>
 
     <select id="selectPdmWorkCompleStatisticsTmpList" parameterType="PdmWorkCompleStatisticsTmp" resultMap="PdmWorkCompleStatisticsTmpResult">
@@ -101,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <insert id="insertPdmWorkCompleStatisticsTmp" parameterType="PdmWorkCompleStatisticsTmp">
-        insert into ads_cst_hywzqlc_pdmworkcomplestatistics_wf
+        insert into ads_cst_hygszdbb_pdmworkcomplestatistics_wf
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="batchId != null">batch_id,</if>
             <if test="batchName != null">batch_name,</if>
@@ -179,7 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updatePdmWorkCompleStatisticsTmp" parameterType="PdmWorkCompleStatisticsTmp">
-        update ads_cst_hywzqlc_pdmworkcomplestatistics_wf
+        update ads_cst_hygszdbb_pdmworkcomplestatistics_wf
         <trim prefix="SET" suffixOverrides=",">
             <if test="batchId != null">batch_id = #{batchId},</if>
             <if test="batchName != null">batch_name = #{batchName},</if>
@@ -220,11 +220,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deletePdmWorkCompleStatisticsTmpById" parameterType="String">
-        delete from ads_cst_hywzqlc_pdmworkcomplestatistics_wf where id = #{id}
+        delete from ads_cst_hygszdbb_pdmworkcomplestatistics_wf where id = #{id}
     </delete>
 
     <delete id="deletePdmWorkCompleStatisticsTmpByIds" parameterType="String">
-        delete from ads_cst_hywzqlc_pdmworkcomplestatistics_wf where id in
+        delete from ads_cst_hygszdbb_pdmworkcomplestatistics_wf where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

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

@@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectPdmWorkPlanVo">
         select id, uuid, week_plan_no, week_plan_id, proj_nm, proj_id, src_id, plan_nm, submit_org_nm, submit_org_id, org_sort, mgmt_org_nm, mgmt_org_id, blg_op_maint_city_org_id, blg_const_city_org_id, ovhaul_const_org_nm, ovhaul_const_org_id, op_maint_org_nm, op_maint_org_id, subs_or_line_nm, subs_or_line_id, op_risk_lvl_cd, op_risk_lvl_dsc, elecgd_risk_lvl_cd, elecgd_risk_lvl_dsc, volt_lvl_cd, volt_lvl_dsc, major_typ_cd, major_typ_dsc, op_typ_cd, op_typ_dsc, workticket_typ_cd, workticket_typ_dsc, poweroff_typ_cd, poweroff_typ_dsc, is_energized_op_cd, is_energized_op_dsc, plan_start_wk_tm, plan_end_tm, op_content, chg_scheme_dsc, op_addr, city_adm_addr, county_adm_addr, detl_pos, landmark_archit, work_team_nm, work_team_id, main_busi_org_op_num, outsourcing_org_op_num, industry_org_op_num, work_princip_nm, work_princip_id, work_princip_contact_mode, major_mgmt_dept, build_mgmt_org_nm, const_org_nm, const_org_id, const_org_cate_cd, const_org_cate_dsc, scntrct_org_nm, scntrct_org_id, scntrct_org_nature_cd, scntrct_org_nature_dsc, inspect_org_nm, inspect_org_id, poweroff_range, supervises_check, scene_supervises, scene_guardianship, release_st_cd, release_st_dsc, release_tm, release_pes, release_person_id, is_release_intime_cd, plan_exec_st_cd, is_chg_more_cd, is_chg_more_dsc, del_mark_cd, del_mark_dsc, bind_qt, is_wear_safetyhat, work_src, create_tm, more_new_tm, plan_typ_cd, plan_typ_dsc, std_org_no, std_org_nm, std_city_org_nm, data_dt, etl_tm, par_mon, std_city_org_no, plan_exec_st_dsc,plan_reason,cancel_reason,risk_type,exception_type,create_by, create_time, update_by, update_time,cancel_type,temporary_type
-        from ads_cst_hywzqlc_pdmworkplan_df
+        from ads_cst_hygszdbb_pdmworkplan_df
     </sql>
 
     <select id="selectPdmWorkPlanList" parameterType="com.ruoyi.powerdistribution.domain.dto.PdmWorkPlanDTO" resultMap="PdmWorkPlanResult">
@@ -251,7 +251,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <insert id="insertPdmWorkPlan" parameterType="PdmWorkPlan" useGeneratedKeys="true" keyProperty="id">
-        insert into ads_cst_hywzqlc_pdmworkplan_df
+        insert into ads_cst_hygszdbb_pdmworkplan_df
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="uuid != null">uuid,</if>
             <if test="weekPlanNo != null">week_plan_no,</if>
@@ -457,7 +457,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updatePdmWorkPlan" parameterType="PdmWorkPlan">
-        update ads_cst_hywzqlc_pdmworkplan_df
+        update ads_cst_hygszdbb_pdmworkplan_df
         <trim prefix="SET" suffixOverrides=",">
             <if test="uuid != null">uuid = #{uuid},</if>
             <if test="weekPlanNo != null">week_plan_no = #{weekPlanNo},</if>
@@ -569,11 +569,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deletePdmWorkPlanById" parameterType="Long">
-        delete from ads_cst_hywzqlc_pdmworkplan_df where id = #{id}
+        delete from ads_cst_hygszdbb_pdmworkplan_df where id = #{id}
     </delete>
 
     <delete id="deletePdmWorkPlanByIds" parameterType="String">
-        delete from ads_cst_hywzqlc_pdmworkplan_df where id in
+        delete from ads_cst_hygszdbb_pdmworkplan_df where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -583,7 +583,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select t1.role_name risk_name,IFNULL(t2.risk_num,0) risk_num from pdm_risk_role t1
         LEFT JOIN
         (
-          select count(1) risk_num,risk_type from ads_cst_hywzqlc_pdmworkplan_df
+          select count(1) risk_num,risk_type from ads_cst_hygszdbb_pdmworkplan_df
           where risk_type not in ('0','1')
           and date_format(plan_start_wk_tm,'%Y%m%d')  = #{date}
           GROUP BY risk_type
@@ -594,7 +594,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from pdm_work_organ t1
         LEFT JOIN
         (
-        SELECT count(1) work_num,submit_org_nm from ads_cst_hywzqlc_pdmworkplan_df
+        SELECT count(1) work_num,submit_org_nm from ads_cst_hygszdbb_pdmworkplan_df
         where
             date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate}
             and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
@@ -602,7 +602,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ) t2 on t1.organ_name = t2.submit_org_nm
     </select>
     <select id="selectWorkPlanByVchicleNo" parameterType="com.ruoyi.powerdistribution.domain.dto.PdmWorkPlanDTO"  resultMap="PdmWorkPlanResult">
-        select *  from ads_cst_hywzqlc_pdmworkplan_df p
+        select *  from ads_cst_hygszdbb_pdmworkplan_df p
         <where>
         <if test="startDate != null and startDate!=''"> and DATE_FORMAT(plan_start_wk_tm,'%Y-%m-%d') &gt;= #{startDate}</if>
         <if test="endDate != null and endDate!=''"> and DATE_FORMAT(plan_end_tm,'%Y-%m-%d') &lt;= #{endDate}</if>
@@ -617,7 +617,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             )
         </where>
         UNION
-        select *  from ads_cst_hywzqlc_pdmworkplan_df
+        select *  from ads_cst_hygszdbb_pdmworkplan_df
         <where>
         <if test="startDate != null and startDate!=''"> and DATE_FORMAT(plan_start_wk_tm,'%Y-%m-%d') &gt;= #{startDate}</if>
         <if test="endDate != null and endDate!=''"> and DATE_FORMAT(plan_end_tm,'%Y-%m-%d') &lt;= #{endDate}</if>
@@ -658,7 +658,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         submit_org_id,
         submit_org_nm
         from
-        ads_cst_hywzqlc_pdmworkplan_df
+        ads_cst_hygszdbb_pdmworkplan_df
         where  date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate}
           and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
         GROUP BY submit_org_id,submit_org_nm
@@ -679,7 +679,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sum(if(op_risk_lvl_cd = '2007005',1,0)) plan_sum_5
 
         from
-            ads_cst_hywzqlc_pdmworkplan_df
+            ads_cst_hygszdbb_pdmworkplan_df
         where  submit_org_nm = #{submitOrgNm}
         and date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate}
         and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
@@ -703,7 +703,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                           ),1,0)) pole_tab_accu_qt_work,
                 sum(if((op_content like '%立%' and op_content like '%杆%') or (op_content like '%撤%' and op_content like '%杆%') ,0,1)) tower_accu_qt_work,
                 sum(1) work_total
-        FROM ads_cst_hywzqlc_pdmworkplan_df
+        FROM ads_cst_hygszdbb_pdmworkplan_df
         <where>
             <if test="startDate != null and startDate!=''">and date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate}</if>
             <if test="endDate != null and endDate!=''">and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}</if>

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików