Merge branch 'master' of http://39.105.58.247:3100/hydw/hycw

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

@@ -1,98 +0,0 @@
-package com.ruoyi.powerdistribution.controller;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-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;
-import org.springframework.web.bind.annotation.RestController;
-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.PdmReportAppointmentWeek;
-import com.ruoyi.powerdistribution.service.IPdmReportAppointmentWeekService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 履职周统计Controller
- *
- * @author ruoyi
- * @date 2024-11-29
- */
-@RestController
-@RequestMapping("/power/appointment/week")
-public class PdmReportAppointmentWeekController extends BaseController
-{
-    @Autowired
-    private IPdmReportAppointmentWeekService pdmReportAppointmentWeekService;
-
-    /**
-     * 查询履职周统计列表
-     */
-    @GetMapping("/list")
-    public TableDataInfo list(PdmReportAppointmentWeek pdmReportAppointmentWeek)
-    {
-        startPage();
-        List<PdmReportAppointmentWeek> list = pdmReportAppointmentWeekService.selectPdmReportAppointmentWeekList(pdmReportAppointmentWeek);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出履职周统计列表
-     */
-    @Log(title = "履职周统计", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, PdmReportAppointmentWeek pdmReportAppointmentWeek)
-    {
-        List<PdmReportAppointmentWeek> list = pdmReportAppointmentWeekService.selectPdmReportAppointmentWeekList(pdmReportAppointmentWeek);
-        ExcelUtil<PdmReportAppointmentWeek> util = new ExcelUtil<PdmReportAppointmentWeek>(PdmReportAppointmentWeek.class);
-        util.exportExcel(response, list, "履职周统计数据");
-    }
-
-    /**
-     * 获取履职周统计详细信息
-     */
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return success(pdmReportAppointmentWeekService.selectPdmReportAppointmentWeekById(id));
-    }
-
-    /**
-     * 新增履职周统计
-     */
-    @Log(title = "履职周统计", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody PdmReportAppointmentWeek pdmReportAppointmentWeek)
-    {
-        return toAjax(pdmReportAppointmentWeekService.insertPdmReportAppointmentWeek(pdmReportAppointmentWeek));
-    }
-
-    /**
-     * 修改履职周统计
-     */
-    @Log(title = "履职周统计", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody PdmReportAppointmentWeek pdmReportAppointmentWeek)
-    {
-        return toAjax(pdmReportAppointmentWeekService.updatePdmReportAppointmentWeek(pdmReportAppointmentWeek));
-    }
-
-    /**
-     * 删除履职周统计
-     */
-    @Log(title = "履职周统计", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(pdmReportAppointmentWeekService.deletePdmReportAppointmentWeekByIds(ids));
-    }
-}

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

@@ -1,98 +0,0 @@
-package com.ruoyi.powerdistribution.controller;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-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;
-import org.springframework.web.bind.annotation.RestController;
-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.PdmReportIllegalWeek;
-import com.ruoyi.powerdistribution.service.IPdmReportIllegalWeekService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 违章周统计Controller
- *
- * @author ruoyi
- * @date 2024-11-29
- */
-@RestController
-@RequestMapping("/power/illegal/week")
-public class PdmReportIllegalWeekController extends BaseController
-{
-    @Autowired
-    private IPdmReportIllegalWeekService pdmReportIllegalWeekService;
-
-    /**
-     * 查询违章周统计列表
-     */
-    @GetMapping("/list")
-    public TableDataInfo list(PdmReportIllegalWeek pdmReportIllegalWeek)
-    {
-        startPage();
-        List<PdmReportIllegalWeek> list = pdmReportIllegalWeekService.selectPdmReportIllegalWeekList(pdmReportIllegalWeek);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出违章周统计列表
-     */
-    @Log(title = "违章周统计", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, PdmReportIllegalWeek pdmReportIllegalWeek)
-    {
-        List<PdmReportIllegalWeek> list = pdmReportIllegalWeekService.selectPdmReportIllegalWeekList(pdmReportIllegalWeek);
-        ExcelUtil<PdmReportIllegalWeek> util = new ExcelUtil<PdmReportIllegalWeek>(PdmReportIllegalWeek.class);
-        util.exportExcel(response, list, "违章周统计数据");
-    }
-
-    /**
-     * 获取违章周统计详细信息
-     */
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return success(pdmReportIllegalWeekService.selectPdmReportIllegalWeekById(id));
-    }
-
-    /**
-     * 新增违章周统计
-     */
-    @Log(title = "违章周统计", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody PdmReportIllegalWeek pdmReportIllegalWeek)
-    {
-        return toAjax(pdmReportIllegalWeekService.insertPdmReportIllegalWeek(pdmReportIllegalWeek));
-    }
-
-    /**
-     * 修改违章周统计
-     */
-    @Log(title = "违章周统计", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody PdmReportIllegalWeek pdmReportIllegalWeek)
-    {
-        return toAjax(pdmReportIllegalWeekService.updatePdmReportIllegalWeek(pdmReportIllegalWeek));
-    }
-
-    /**
-     * 删除违章周统计
-     */
-    @Log(title = "违章周统计", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(pdmReportIllegalWeekService.deletePdmReportIllegalWeekByIds(ids));
-    }
-}

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

@@ -1,98 +0,0 @@
-package com.ruoyi.powerdistribution.controller;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-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;
-import org.springframework.web.bind.annotation.RestController;
-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.PdmReportPlanNextWeek;
-import com.ruoyi.powerdistribution.service.IPdmReportPlanNextWeekService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 下周工作计划统计Controller
- *
- * @author ruoyi
- * @date 2024-11-29
- */
-@RestController
-@RequestMapping("/power/next/week")
-public class PdmReportPlanNextWeekController extends BaseController
-{
-    @Autowired
-    private IPdmReportPlanNextWeekService pdmReportPlanNextWeekService;
-
-    /**
-     * 查询下周工作计划统计列表
-     */
-    @GetMapping("/list")
-    public TableDataInfo list(PdmReportPlanNextWeek pdmReportPlanNextWeek)
-    {
-        startPage();
-        List<PdmReportPlanNextWeek> list = pdmReportPlanNextWeekService.selectPdmReportPlanNextWeekList(pdmReportPlanNextWeek);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出下周工作计划统计列表
-     */
-    @Log(title = "下周工作计划统计", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, PdmReportPlanNextWeek pdmReportPlanNextWeek)
-    {
-        List<PdmReportPlanNextWeek> list = pdmReportPlanNextWeekService.selectPdmReportPlanNextWeekList(pdmReportPlanNextWeek);
-        ExcelUtil<PdmReportPlanNextWeek> util = new ExcelUtil<PdmReportPlanNextWeek>(PdmReportPlanNextWeek.class);
-        util.exportExcel(response, list, "下周工作计划统计数据");
-    }
-
-    /**
-     * 获取下周工作计划统计详细信息
-     */
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return success(pdmReportPlanNextWeekService.selectPdmReportPlanNextWeekById(id));
-    }
-
-    /**
-     * 新增下周工作计划统计
-     */
-    @Log(title = "下周工作计划统计", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody PdmReportPlanNextWeek pdmReportPlanNextWeek)
-    {
-        return toAjax(pdmReportPlanNextWeekService.insertPdmReportPlanNextWeek(pdmReportPlanNextWeek));
-    }
-
-    /**
-     * 修改下周工作计划统计
-     */
-    @Log(title = "下周工作计划统计", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody PdmReportPlanNextWeek pdmReportPlanNextWeek)
-    {
-        return toAjax(pdmReportPlanNextWeekService.updatePdmReportPlanNextWeek(pdmReportPlanNextWeek));
-    }
-
-    /**
-     * 删除下周工作计划统计
-     */
-    @Log(title = "下周工作计划统计", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(pdmReportPlanNextWeekService.deletePdmReportPlanNextWeekByIds(ids));
-    }
-}

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

@@ -1,98 +0,0 @@
-package com.ruoyi.powerdistribution.controller;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-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;
-import org.springframework.web.bind.annotation.RestController;
-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.PdmReportPlanWeek;
-import com.ruoyi.powerdistribution.service.IPdmReportPlanWeekService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * 工作计划完成情况周统计Controller
- *
- * @author ruoyi
- * @date 2024-11-29
- */
-@RestController
-@RequestMapping("/power/plan/week")
-public class PdmReportPlanWeekController extends BaseController
-{
-    @Autowired
-    private IPdmReportPlanWeekService pdmReportPlanWeekService;
-
-    /**
-     * 查询工作计划完成情况周统计列表
-     */
-    @GetMapping("/list")
-    public TableDataInfo list(PdmReportPlanWeek pdmReportPlanWeek)
-    {
-        startPage();
-        List<PdmReportPlanWeek> list = pdmReportPlanWeekService.selectPdmReportPlanWeekList(pdmReportPlanWeek);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出工作计划完成情况周统计列表
-     */
-    @Log(title = "工作计划完成情况周统计", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, PdmReportPlanWeek pdmReportPlanWeek)
-    {
-        List<PdmReportPlanWeek> list = pdmReportPlanWeekService.selectPdmReportPlanWeekList(pdmReportPlanWeek);
-        ExcelUtil<PdmReportPlanWeek> util = new ExcelUtil<PdmReportPlanWeek>(PdmReportPlanWeek.class);
-        util.exportExcel(response, list, "工作计划完成情况周统计数据");
-    }
-
-    /**
-     * 获取工作计划完成情况周统计详细信息
-     */
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return success(pdmReportPlanWeekService.selectPdmReportPlanWeekById(id));
-    }
-
-    /**
-     * 新增工作计划完成情况周统计
-     */
-    @Log(title = "工作计划完成情况周统计", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody PdmReportPlanWeek pdmReportPlanWeek)
-    {
-        return toAjax(pdmReportPlanWeekService.insertPdmReportPlanWeek(pdmReportPlanWeek));
-    }
-
-    /**
-     * 修改工作计划完成情况周统计
-     */
-    @Log(title = "工作计划完成情况周统计", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody PdmReportPlanWeek pdmReportPlanWeek)
-    {
-        return toAjax(pdmReportPlanWeekService.updatePdmReportPlanWeek(pdmReportPlanWeek));
-    }
-
-    /**
-     * 删除工作计划完成情况周统计
-     */
-    @Log(title = "工作计划完成情况周统计", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(pdmReportPlanWeekService.deletePdmReportPlanWeekByIds(ids));
-    }
-}

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

@@ -43,12 +43,6 @@ public class ReportController extends BaseController {
     @Autowired
     private IPdmReportPlanNextDayService pdmReportPlanNextDayService;
     @Autowired
-    private IPdmReportAppointmentWeekService pdmReportAppointmentWeekService;
-    @Autowired
-    private IPdmReportPlanWeekService pdmReportPlanWeekService;
-    @Autowired
-    private IPdmReportPlanNextWeekService pdmReportPlanNextWeekService;
-    @Autowired
     private IPdmWorkPlanService pdmWorkPlanService;
 
     /**
@@ -56,8 +50,7 @@ public class ReportController extends BaseController {
      */
     @ApiOperation(value = "日报查询", notes = "日报查询")
     @GetMapping("/day")
-    public ReportDayVO day(String startDate,String endDate)
-    {
+    public ReportDayVO day(String startDate, String endDate) {
         PdmReportIllegalDay pdmReportIllegalDay = new PdmReportIllegalDay();
         pdmReportIllegalDay.setStartDate(startDate);
         pdmReportIllegalDay.setEndDate(endDate);
@@ -71,13 +64,13 @@ public class ReportController extends BaseController {
         pdmReportPlanDay.setEndDate(endDate);
         List<PdmReportPlanDay> planlist = pdmReportPlanDayService.selectPlanReport(pdmReportPlanDay);
         PdmReportPlanNextDay nextDay = new PdmReportPlanNextDay();
-        nextDay.setStartDate(DateUtils.getNextDateStr(endDate,DateUtils.YYYYMMDD,1));
-        nextDay.setEndDate(DateUtils.getNextDateStr(endDate,DateUtils.YYYYMMDD,1));
+        nextDay.setStartDate(DateUtils.getNextDateStr(endDate, DateUtils.YYYYMMDD, 1));
+        nextDay.setEndDate(DateUtils.getNextDateStr(endDate, DateUtils.YYYYMMDD, 1));
         List<PdmReportPlanNextDay> nextDayList = pdmReportPlanNextDayService.selectReportPlanNext(nextDay);
 
         ReportDayVO vo = new ReportDayVO();
         vo.setAppointmentList(appointmentlist);
-        vo.setIllegalList((illegalList==null||(illegalList.size()==1&&illegalList.get(0).getCompany().equals("总计")))?new ArrayList<>():illegalList);
+        vo.setIllegalList((illegalList == null || (illegalList.size() == 1 && illegalList.get(0).getCompany().equals("总计"))) ? new ArrayList<>() : illegalList);
         vo.setPlanList(planlist);
         vo.setNextDayList(nextDayList);
         return vo;
@@ -85,13 +78,14 @@ public class ReportController extends BaseController {
 
     /**
      * 日报导出 停用
+     *
      * @param response
      * @param reportDate
      * @throws IOException
      */
     @PostMapping("/dayExport")
     @ApiOperation(value = "日报导出")
-    public void dayExport(HttpServletResponse response,String reportDate) throws IOException {
+    public void dayExport(HttpServletResponse response, String reportDate) throws IOException {
         PdmReportIllegalDay pdmReportIllegalDay = new PdmReportIllegalDay();
         pdmReportIllegalDay.setReportDate(reportDate);
         List<PdmReportIllegalDay> illegalList = pdmReportIllegalDayService.selectPdmReportIllegalDayList(pdmReportIllegalDay);
@@ -102,7 +96,7 @@ public class ReportController extends BaseController {
         pdmReportPlanDay.setReportDate(reportDate);
         List<PdmReportPlanDay> planlist = pdmReportPlanDayService.selectPdmReportPlanDayList(pdmReportPlanDay);
         PdmReportPlanNextDay nextDay = new PdmReportPlanNextDay();
-        nextDay.setReportDate(DateUtils.getNextDateStr(reportDate,DateUtils.YYYYMMDD,1));
+        nextDay.setReportDate(DateUtils.getNextDateStr(reportDate, DateUtils.YYYYMMDD, 1));
         List<PdmReportPlanNextDay> nextDayList = pdmReportPlanNextDayService.selectPdmReportPlanNextDayList(nextDay);
 
         response.setContentType("application/vnd.ms-excel");
@@ -132,8 +126,7 @@ public class ReportController extends BaseController {
      */
     @ApiOperation(value = "周报查询", notes = "周报查询")
     @GetMapping("/week")
-    public ReportDayWeek week(String startDate,String endDate)
-    {
+    public ReportDayWeek week(String startDate, String endDate) {
         PdmReportIllegalDay pdmReportIllegal = new PdmReportIllegalDay();
         pdmReportIllegal.setStartDate(startDate);
         pdmReportIllegal.setEndDate(endDate);
@@ -148,13 +141,13 @@ public class ReportController extends BaseController {
         List<PdmReportPlanDay> planlist = pdmReportPlanDayService.selectPlanReport(pdmReportPlanDay);
 
         PdmReportPlanNextDay nextDay = new PdmReportPlanNextDay();
-        nextDay.setStartDate(DateUtils.getNextMonday(startDate,DateUtils.YYYYMMDD));
-        nextDay.setEndDate(DateUtils.getNextSunday(endDate,DateUtils.YYYYMMDD));
+        nextDay.setStartDate(DateUtils.getNextMonday(startDate, DateUtils.YYYYMMDD));
+        nextDay.setEndDate(DateUtils.getNextSunday(endDate, DateUtils.YYYYMMDD));
         List<PdmReportPlanNextDay> nextList = pdmReportPlanNextDayService.selectReportPlanNext(nextDay);
 
         PdmWorkPlanDTO workPlan = new PdmWorkPlanDTO();
-        workPlan.setStartDate(DateUtils.getNextMonday(startDate,DateUtils.YYYYMMDD));
-        workPlan.setEndDate(DateUtils.getNextSunday(endDate,DateUtils.YYYYMMDD));
+        workPlan.setStartDate(DateUtils.getNextMonday(startDate, DateUtils.YYYYMMDD));
+        workPlan.setEndDate(DateUtils.getNextSunday(endDate, DateUtils.YYYYMMDD));
         workPlan.setLevel3Flag("1");//三级及以上作业
         List<PdmWorkPlan> workList = pdmWorkPlanService.selectPdmWorkPlanList(workPlan);
 
@@ -167,58 +160,4 @@ public class ReportController extends BaseController {
         return vo;
     }
 
-    /**
-     * 周报导出 停用
-     * @param response
-     * @param startDate
-     * @param endDate
-     * @throws IOException
-     */
-    @PostMapping("/weekExport")
-    @ApiOperation(value = "周报导出")
-    public void weekExport(HttpServletResponse response,String startDate,String endDate) throws IOException {
-        PdmReportIllegalDay pdmReportIllegal = new PdmReportIllegalDay();
-        pdmReportIllegal.setStartDate(startDate);
-        pdmReportIllegal.setEndDate(endDate);
-        List<PdmReportIllegalDay> illegalList = pdmReportIllegalDayService.selectIllegalReport(pdmReportIllegal);
-        PdmReportAppointmentWeek pdmReportAppointment = new PdmReportAppointmentWeek();
-        pdmReportAppointment.setReportDate(startDate);
-        pdmReportAppointment.setReportEndDate(endDate);
-        List<PdmReportAppointmentWeek> appointmentlist = pdmReportAppointmentWeekService.selectPdmReportAppointmentWeekList(pdmReportAppointment);
-        PdmReportPlanWeek pdmReportPlan = new PdmReportPlanWeek();
-        pdmReportPlan.setReportDate(startDate);
-        pdmReportPlan.setReportEndDate(endDate);
-        List<PdmReportPlanWeek> planlist = pdmReportPlanWeekService.selectPdmReportPlanWeekList(pdmReportPlan);
-        PdmReportPlanNextWeek next = new PdmReportPlanNextWeek();
-        next.setReportDate(DateUtils.getNextMonday(startDate,DateUtils.YYYYMMDD));
-        List<PdmReportPlanNextWeek> nextList = pdmReportPlanNextWeekService.selectPdmReportPlanNextWeekList(next);
-        PdmWorkPlanDTO workPlan = new PdmWorkPlanDTO();
-        workPlan.setStartDate(DateUtils.getNextMonday(startDate,DateUtils.YYYYMMDD));
-        workPlan.setEndDate(DateUtils.getNextSunday(endDate,DateUtils.YYYYMMDD));
-        workPlan.setLevel3Flag("1");//三级及以上作业
-        List<PdmWorkPlan> workList = pdmWorkPlanService.selectPdmWorkPlanList(workPlan);
-
-        response.setContentType("application/vnd.ms-excel");
-        response.setCharacterEncoding("utf-8");
-        String fileName = java.util.UUID.randomUUID() + ".xlsx";
-        response.setHeader("Content-disposition", "attachment;filename=" + fileName);
-        String templateFileName = "excelTemplate/weekReport.xlsx";
-        InputStream fis = Thread.currentThread().getContextClassLoader().getResourceAsStream(templateFileName);
-        OutputStream ops = response.getOutputStream();
-
-        ExcelWriter excelWriter = EasyExcel.write(ops).withTemplate(fis).build();
-        WriteSheet writeSheet = EasyExcel.writerSheet("违章情况").build();
-        FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
-        excelWriter.fill(illegalList, fillConfig, writeSheet);
-        WriteSheet writeSheet2 = EasyExcel.writerSheet("本周计划执行情况").build();
-        excelWriter.fill(planlist, fillConfig, writeSheet2);
-        WriteSheet writeSheet3 = EasyExcel.writerSheet("履职情况").build();
-        excelWriter.fill(appointmentlist, fillConfig, writeSheet3);
-        WriteSheet writeSheet4 = EasyExcel.writerSheet("下周计划安排").build();
-        excelWriter.fill(nextList, fillConfig, writeSheet4);
-        WriteSheet writeSheet5 = EasyExcel.writerSheet("三级及以上作业风险计划").build();
-        excelWriter.fill(workList, fillConfig, writeSheet5);
-        excelWriter.finish();
-
-    }
 }

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

@@ -44,9 +44,6 @@ public class WeeklyReportController extends BaseController {
     private IPdmWorkPlanService pdmWorkPlanService;
     @Autowired
     private IPdmReportPlanDayService pdmReportPlanDayService;
-
-    @Autowired
-    private IPdmReportPlanWeekService pdmReportPlanWeekService;
     @Autowired
     private IPdmReportAppointmentDayService pdmReportAppointmentDayService;
 
@@ -93,10 +90,10 @@ public class WeeklyReportController extends BaseController {
             tmpPlanRate=pdmReportPlan.getTemporaryPlanRatio();
             cancelTmpPlanRecNum=pdmReportPlan.getTemporaryCancelSum();
             tmpPlanImplRate=pdmReportPlan.getTemporaryRatio();
-           List<PdmReportPlanWeek> planlist2=new ArrayList<>();
+           List<PdmReportPlanDay> planlist2=new ArrayList<>();
            planlist.forEach(plan->{
                if(!plan.getCompany().equals("总计")){
-                   PdmReportPlanWeek planWeek=new PdmReportPlanWeek();
+                   PdmReportPlanDay planWeek=new PdmReportPlanDay();
                    BeanUtils.copyBeanProp(planWeek,plan);
                    planlist2.add(planWeek);
                }
@@ -113,7 +110,7 @@ public class WeeklyReportController extends BaseController {
 //                   return 0;
 //               }
 //           });
-           PdmReportPlanWeek lowPdmReportPlan=planlist2.get(planlist2.size()-1);
+           PdmReportPlanDay lowPdmReportPlan=planlist2.get(planlist2.size()-1);
            lowImplUnit=lowPdmReportPlan.getCompany();
            lowImplRate=lowPdmReportPlan.getWeekRatio();
        }

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

@@ -1,195 +0,0 @@
-package com.ruoyi.powerdistribution.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 履职周统计对象 pdm_report_appointment_week
- *
- * @author ruoyi
- * @date 2024-11-29
- */
-public class PdmReportAppointmentWeek extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    private Long id;
-
-    /** 单位 */
-    @Excel(name = "单位")
-    private String company;
-
-    /** 日期 */
-    @Excel(name = "日期")
-    private String reportDate;
-
-    /** 结束日期 */
-    @Excel(name = "结束日期")
-    private String reportEndDate;
-
-    /** 督察现场数量 三级 */
-    @Excel(name = "督察现场数量 三级")
-    private Integer checkNum3;
-
-    /** 督察现场数量 四级 */
-    @Excel(name = "督察现场数量 四级")
-    private Integer checkNum4;
-
-    /** 督察现场数量 五级 */
-    @Excel(name = "督察现场数量 五级")
-    private Integer checkNum5;
-
-    /** 领导督察次数 */
-    @Excel(name = "领导督察次数")
-    private Integer bossSum;
-
-    /** 管理督察次数 */
-    @Excel(name = "管理督察次数")
-    private Integer manageSum;
-
-    /** 问题数量 */
-    @Excel(name = "问题数量")
-    private Integer problemSum;
-
-    /** 未履职数量 */
-    @Excel(name = "未履职数量")
-    private Integer absentSum;
-
-    /** 市公司查处问题数 */
-    @Excel(name = "市公司查处问题数")
-    private Integer cityCheckSum;
-
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public Long getId()
-    {
-        return id;
-    }
-    public void setCompany(String company)
-    {
-        this.company = company;
-    }
-
-    public String getCompany()
-    {
-        return company;
-    }
-    public void setReportDate(String reportDate)
-    {
-        this.reportDate = reportDate;
-    }
-
-    public String getReportDate()
-    {
-        return reportDate;
-    }
-    public void setReportEndDate(String reportEndDate)
-    {
-        this.reportEndDate = reportEndDate;
-    }
-
-    public String getReportEndDate()
-    {
-        return reportEndDate;
-    }
-    public void setCheckNum3(Integer checkNum3)
-    {
-        this.checkNum3 = checkNum3;
-    }
-
-    public Integer getCheckNum3()
-    {
-        return checkNum3;
-    }
-    public void setCheckNum4(Integer checkNum4)
-    {
-        this.checkNum4 = checkNum4;
-    }
-
-    public Integer getCheckNum4()
-    {
-        return checkNum4;
-    }
-    public void setCheckNum5(Integer checkNum5)
-    {
-        this.checkNum5 = checkNum5;
-    }
-
-    public Integer getCheckNum5()
-    {
-        return checkNum5;
-    }
-    public void setBossSum(Integer bossSum)
-    {
-        this.bossSum = bossSum;
-    }
-
-    public Integer getBossSum()
-    {
-        return bossSum;
-    }
-    public void setManageSum(Integer manageSum)
-    {
-        this.manageSum = manageSum;
-    }
-
-    public Integer getManageSum()
-    {
-        return manageSum;
-    }
-    public void setProblemSum(Integer problemSum)
-    {
-        this.problemSum = problemSum;
-    }
-
-    public Integer getProblemSum()
-    {
-        return problemSum;
-    }
-    public void setAbsentSum(Integer absentSum)
-    {
-        this.absentSum = absentSum;
-    }
-
-    public Integer getAbsentSum()
-    {
-        return absentSum;
-    }
-    public void setCityCheckSum(Integer cityCheckSum)
-    {
-        this.cityCheckSum = cityCheckSum;
-    }
-
-    public Integer getCityCheckSum()
-    {
-        return cityCheckSum;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("company", getCompany())
-            .append("reportDate", getReportDate())
-            .append("reportEndDate", getReportEndDate())
-            .append("checkNum3", getCheckNum3())
-            .append("checkNum4", getCheckNum4())
-            .append("checkNum5", getCheckNum5())
-            .append("bossSum", getBossSum())
-            .append("manageSum", getManageSum())
-            .append("problemSum", getProblemSum())
-            .append("absentSum", getAbsentSum())
-            .append("cityCheckSum", getCityCheckSum())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}

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

@@ -1,167 +0,0 @@
-package com.ruoyi.powerdistribution.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 违章周统计对象 pdm_report_illegal_week  作废
- *
- * @author ruoyi
- * @date 2024-11-29
- */
-public class PdmReportIllegalWeek extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    private Long id;
-
-    /** 单位 */
-    @Excel(name = "单位")
-    private String company;
-
-    /** 开始日期 */
-    @Excel(name = "开始日期")
-    private String reportDate;
-
-    /** 结束日期 */
-    @Excel(name = "结束日期")
-    private String reportEndDate;
-
-    /** 省违章数(严重) */
-    @Excel(name = "省违章数(严重)")
-    private Integer provinceNum1;
-
-    /** 省违章数(一般) */
-    @Excel(name = "省违章数(一般)")
-    private Integer provinceNum2;
-
-    /** 市违章数(严重) */
-    @Excel(name = "市违章数(严重)")
-    private Integer cityNum1;
-
-    /** 市违章数(一般) */
-    @Excel(name = "市违章数(一般)")
-    private Integer cityNum2;
-
-    /** 县违章数(严重) */
-    @Excel(name = "县违章数(严重)")
-    private Integer countyNum1;
-
-    /** 县违章数(一般) */
-    @Excel(name = "县违章数(一般)")
-    private Integer countyNum2;
-
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public Long getId()
-    {
-        return id;
-    }
-    public void setCompany(String company)
-    {
-        this.company = company;
-    }
-
-    public String getCompany()
-    {
-        return company;
-    }
-    public void setReportDate(String reportDate)
-    {
-        this.reportDate = reportDate;
-    }
-
-    public String getReportDate()
-    {
-        return reportDate;
-    }
-    public void setReportEndDate(String reportEndDate)
-    {
-        this.reportEndDate = reportEndDate;
-    }
-
-    public String getReportEndDate()
-    {
-        return reportEndDate;
-    }
-    public void setProvinceNum1(Integer provinceNum1)
-    {
-        this.provinceNum1 = provinceNum1;
-    }
-
-    public Integer getProvinceNum1()
-    {
-        return provinceNum1;
-    }
-    public void setProvinceNum2(Integer provinceNum2)
-    {
-        this.provinceNum2 = provinceNum2;
-    }
-
-    public Integer getProvinceNum2()
-    {
-        return provinceNum2;
-    }
-    public void setCityNum1(Integer cityNum1)
-    {
-        this.cityNum1 = cityNum1;
-    }
-
-    public Integer getCityNum1()
-    {
-        return cityNum1;
-    }
-    public void setCityNum2(Integer cityNum2)
-    {
-        this.cityNum2 = cityNum2;
-    }
-
-    public Integer getCityNum2()
-    {
-        return cityNum2;
-    }
-    public void setCountyNum1(Integer countyNum1)
-    {
-        this.countyNum1 = countyNum1;
-    }
-
-    public Integer getCountyNum1()
-    {
-        return countyNum1;
-    }
-    public void setCountyNum2(Integer countyNum2)
-    {
-        this.countyNum2 = countyNum2;
-    }
-
-    public Integer getCountyNum2()
-    {
-        return countyNum2;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("company", getCompany())
-            .append("reportDate", getReportDate())
-            .append("reportEndDate", getReportEndDate())
-            .append("provinceNum1", getProvinceNum1())
-            .append("provinceNum2", getProvinceNum2())
-            .append("cityNum1", getCityNum1())
-            .append("cityNum2", getCityNum2())
-            .append("countyNum1", getCountyNum1())
-            .append("countyNum2", getCountyNum2())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}

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

@@ -1,237 +0,0 @@
-package com.ruoyi.powerdistribution.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 下周工作计划统计对象 pdm_report_plan_next_week
- *
- * @author ruoyi
- * @date 2024-11-29
- */
-public class PdmReportPlanNextWeek extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    private Long id;
-
-    /** 单位 */
-    @Excel(name = "单位")
-    private String company;
-
-    /** 日期 */
-    @Excel(name = "日期")
-    private String reportDate;
-
-    /** 结束日期 */
-    @Excel(name = "结束日期")
-    private String reportEndDate;
-
-    /** 作业总数 */
-    @Excel(name = "作业总数")
-    private Integer workTotal;
-
-    /** 倒闸操作总数 */
-    @Excel(name = "倒闸操作总数")
-    private Integer workType1Sum;
-
-    /** 配网工程总数 */
-    @Excel(name = "配网工程总数")
-    private Integer workType2Sum;
-
-    /** 业扩杆迁总数 */
-    @Excel(name = "业扩杆迁总数")
-    private Integer workType3Sum;
-
-    /** 运维检修总数 */
-    @Excel(name = "运维检修总数")
-    private Integer workType4Sum;
-
-    /** 其他总数 */
-    @Excel(name = "其他总数")
-    private Integer workType5Sum;
-
-    /** 带电作业数量 */
-    @Excel(name = "带电作业数量")
-    private Integer elePlanSum;
-
-    /** 作业风险 三级 */
-    @Excel(name = "作业风险 三级")
-    private String planLeve3;
-
-    /** 作业风险 四级 */
-    @Excel(name = "作业风险 四级")
-    private String planLeve4;
-
-    /** 作业风险 五级 */
-    @Excel(name = "作业风险 五级")
-    private String planLeve5;
-
-    /** 重点关注检修面 */
-    @Excel(name = "重点关注检修面")
-    private String checkDetail;
-
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public Long getId()
-    {
-        return id;
-    }
-    public void setCompany(String company)
-    {
-        this.company = company;
-    }
-
-    public String getCompany()
-    {
-        return company;
-    }
-    public void setReportDate(String reportDate)
-    {
-        this.reportDate = reportDate;
-    }
-
-    public String getReportDate()
-    {
-        return reportDate;
-    }
-    public void setReportEndDate(String reportEndDate)
-    {
-        this.reportEndDate = reportEndDate;
-    }
-
-    public String getReportEndDate()
-    {
-        return reportEndDate;
-    }
-    public void setWorkTotal(Integer workTotal)
-    {
-        this.workTotal = workTotal;
-    }
-
-    public Integer getWorkTotal()
-    {
-        return workTotal;
-    }
-    public void setWorkType1Sum(Integer workType1Sum)
-    {
-        this.workType1Sum = workType1Sum;
-    }
-
-    public Integer getWorkType1Sum()
-    {
-        return workType1Sum;
-    }
-    public void setWorkType2Sum(Integer workType2Sum)
-    {
-        this.workType2Sum = workType2Sum;
-    }
-
-    public Integer getWorkType2Sum()
-    {
-        return workType2Sum;
-    }
-    public void setWorkType3Sum(Integer workType3Sum)
-    {
-        this.workType3Sum = workType3Sum;
-    }
-
-    public Integer getWorkType3Sum()
-    {
-        return workType3Sum;
-    }
-    public void setWorkType4Sum(Integer workType4Sum)
-    {
-        this.workType4Sum = workType4Sum;
-    }
-
-    public Integer getWorkType4Sum()
-    {
-        return workType4Sum;
-    }
-    public void setWorkType5Sum(Integer workType5Sum)
-    {
-        this.workType5Sum = workType5Sum;
-    }
-
-    public Integer getWorkType5Sum()
-    {
-        return workType5Sum;
-    }
-    public void setElePlanSum(Integer elePlanSum)
-    {
-        this.elePlanSum = elePlanSum;
-    }
-
-    public Integer getElePlanSum()
-    {
-        return elePlanSum;
-    }
-    public void setPlanLeve3(String planLeve3)
-    {
-        this.planLeve3 = planLeve3;
-    }
-
-    public String getPlanLeve3()
-    {
-        return planLeve3;
-    }
-    public void setPlanLeve4(String planLeve4)
-    {
-        this.planLeve4 = planLeve4;
-    }
-
-    public String getPlanLeve4()
-    {
-        return planLeve4;
-    }
-    public void setPlanLeve5(String planLeve5)
-    {
-        this.planLeve5 = planLeve5;
-    }
-
-    public String getPlanLeve5()
-    {
-        return planLeve5;
-    }
-    public void setCheckDetail(String checkDetail)
-    {
-        this.checkDetail = checkDetail;
-    }
-
-    public String getCheckDetail()
-    {
-        return checkDetail;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("company", getCompany())
-            .append("reportDate", getReportDate())
-            .append("reportEndDate", getReportEndDate())
-            .append("workTotal", getWorkTotal())
-            .append("workType1Sum", getWorkType1Sum())
-            .append("workType2Sum", getWorkType2Sum())
-            .append("workType3Sum", getWorkType3Sum())
-            .append("workType4Sum", getWorkType4Sum())
-            .append("workType5Sum", getWorkType5Sum())
-            .append("elePlanSum", getElePlanSum())
-            .append("planLeve3", getPlanLeve3())
-            .append("planLeve4", getPlanLeve4())
-            .append("planLeve5", getPlanLeve5())
-            .append("checkDetail", getCheckDetail())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}

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

@@ -1,195 +0,0 @@
-package com.ruoyi.powerdistribution.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 工作计划完成情况周统计对象 pdm_report_plan_week 作废
- *
- * @author ruoyi
- * @date 2024-11-29
- */
-public class PdmReportPlanWeek extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    private Long id;
-
-    /** 单位 */
-    @Excel(name = "单位")
-    private String company;
-
-    /** 日期 */
-    @Excel(name = "日期")
-    private String reportDate;
-
-    /** 结束日期 */
-    @Excel(name = "结束日期")
-    private String reportEndDate;
-
-    /** 作业总数 */
-    @Excel(name = "作业总数")
-    private Integer total;
-
-    /** 周计划总数 */
-    @Excel(name = "周计划总数")
-    private Integer weekSum;
-
-    /** 周计划取消数 */
-    @Excel(name = "周计划取消数")
-    private Integer weekCancelSum;
-
-    /** 周计划执行率 */
-    @Excel(name = "周计划执行率")
-    private String weekRatio;
-
-    /** 临时计划总数 */
-    @Excel(name = "临时计划总数")
-    private Integer temporarySum;
-
-    /** 临时计划取消数 */
-    @Excel(name = "临时计划取消数")
-    private Integer temporaryCancelSum;
-
-    /** 临时计划执行率 */
-    @Excel(name = "临时计划执行率")
-    private String temporaryRatio;
-
-    /** 临时计划率 */
-    @Excel(name = "临时计划率")
-    private String temporaryPlanRatio;
-
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public Long getId()
-    {
-        return id;
-    }
-    public void setCompany(String company)
-    {
-        this.company = company;
-    }
-
-    public String getCompany()
-    {
-        return company;
-    }
-    public void setReportDate(String reportDate)
-    {
-        this.reportDate = reportDate;
-    }
-
-    public String getReportDate()
-    {
-        return reportDate;
-    }
-    public void setReportEndDate(String reportEndDate)
-    {
-        this.reportEndDate = reportEndDate;
-    }
-
-    public String getReportEndDate()
-    {
-        return reportEndDate;
-    }
-    public void setTotal(Integer total)
-    {
-        this.total = total;
-    }
-
-    public Integer getTotal()
-    {
-        return total;
-    }
-    public void setWeekSum(Integer weekSum)
-    {
-        this.weekSum = weekSum;
-    }
-
-    public Integer getWeekSum()
-    {
-        return weekSum;
-    }
-    public void setWeekCancelSum(Integer weekCancelSum)
-    {
-        this.weekCancelSum = weekCancelSum;
-    }
-
-    public Integer getWeekCancelSum()
-    {
-        return weekCancelSum;
-    }
-    public void setWeekRatio(String weekRatio)
-    {
-        this.weekRatio = weekRatio;
-    }
-
-    public String getWeekRatio()
-    {
-        return weekRatio;
-    }
-    public void setTemporarySum(Integer temporarySum)
-    {
-        this.temporarySum = temporarySum;
-    }
-
-    public Integer getTemporarySum()
-    {
-        return temporarySum;
-    }
-    public void setTemporaryCancelSum(Integer temporaryCancelSum)
-    {
-        this.temporaryCancelSum = temporaryCancelSum;
-    }
-
-    public Integer getTemporaryCancelSum()
-    {
-        return temporaryCancelSum;
-    }
-    public void setTemporaryRatio(String temporaryRatio)
-    {
-        this.temporaryRatio = temporaryRatio;
-    }
-
-    public String getTemporaryRatio()
-    {
-        return temporaryRatio;
-    }
-    public void setTemporaryPlanRatio(String temporaryPlanRatio)
-    {
-        this.temporaryPlanRatio = temporaryPlanRatio;
-    }
-
-    public String getTemporaryPlanRatio()
-    {
-        return temporaryPlanRatio;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("company", getCompany())
-            .append("reportDate", getReportDate())
-            .append("reportEndDate", getReportEndDate())
-            .append("total", getTotal())
-            .append("weekSum", getWeekSum())
-            .append("weekCancelSum", getWeekCancelSum())
-            .append("weekRatio", getWeekRatio())
-            .append("temporarySum", getTemporarySum())
-            .append("temporaryCancelSum", getTemporaryCancelSum())
-            .append("temporaryRatio", getTemporaryRatio())
-            .append("temporaryPlanRatio", getTemporaryPlanRatio())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}

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

@@ -5,7 +5,7 @@ import com.ruoyi.powerdistribution.domain.*;
 import java.util.List;
 
 /**
- * 日报VO
+ * 周报VO
  */
 public class ReportDayWeek {
 

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

@@ -1,61 +0,0 @@
-package com.ruoyi.powerdistribution.mapper;
-
-import java.util.List;
-import com.ruoyi.powerdistribution.domain.PdmReportAppointmentWeek;
-
-/**
- * 履职周统计Mapper接口
- *
- * @author ruoyi
- * @date 2024-11-29
- */
-public interface PdmReportAppointmentWeekMapper
-{
-    /**
-     * 查询履职周统计
-     *
-     * @param id 履职周统计主键
-     * @return 履职周统计
-     */
-    public PdmReportAppointmentWeek selectPdmReportAppointmentWeekById(Long id);
-
-    /**
-     * 查询履职周统计列表
-     *
-     * @param pdmReportAppointmentWeek 履职周统计
-     * @return 履职周统计集合
-     */
-    public List<PdmReportAppointmentWeek> selectPdmReportAppointmentWeekList(PdmReportAppointmentWeek pdmReportAppointmentWeek);
-
-    /**
-     * 新增履职周统计
-     *
-     * @param pdmReportAppointmentWeek 履职周统计
-     * @return 结果
-     */
-    public int insertPdmReportAppointmentWeek(PdmReportAppointmentWeek pdmReportAppointmentWeek);
-
-    /**
-     * 修改履职周统计
-     *
-     * @param pdmReportAppointmentWeek 履职周统计
-     * @return 结果
-     */
-    public int updatePdmReportAppointmentWeek(PdmReportAppointmentWeek pdmReportAppointmentWeek);
-
-    /**
-     * 删除履职周统计
-     *
-     * @param id 履职周统计主键
-     * @return 结果
-     */
-    public int deletePdmReportAppointmentWeekById(Long id);
-
-    /**
-     * 批量删除履职周统计
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deletePdmReportAppointmentWeekByIds(Long[] ids);
-}

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

@@ -1,61 +0,0 @@
-package com.ruoyi.powerdistribution.mapper;
-
-import java.util.List;
-import com.ruoyi.powerdistribution.domain.PdmReportIllegalWeek;
-
-/**
- * 违章周统计Mapper接口
- *
- * @author ruoyi
- * @date 2024-11-29
- */
-public interface PdmReportIllegalWeekMapper
-{
-    /**
-     * 查询违章周统计
-     *
-     * @param id 违章周统计主键
-     * @return 违章周统计
-     */
-    public PdmReportIllegalWeek selectPdmReportIllegalWeekById(Long id);
-
-    /**
-     * 查询违章周统计列表
-     *
-     * @param pdmReportIllegalWeek 违章周统计
-     * @return 违章周统计集合
-     */
-    public List<PdmReportIllegalWeek> selectPdmReportIllegalWeekList(PdmReportIllegalWeek pdmReportIllegalWeek);
-
-    /**
-     * 新增违章周统计
-     *
-     * @param pdmReportIllegalWeek 违章周统计
-     * @return 结果
-     */
-    public int insertPdmReportIllegalWeek(PdmReportIllegalWeek pdmReportIllegalWeek);
-
-    /**
-     * 修改违章周统计
-     *
-     * @param pdmReportIllegalWeek 违章周统计
-     * @return 结果
-     */
-    public int updatePdmReportIllegalWeek(PdmReportIllegalWeek pdmReportIllegalWeek);
-
-    /**
-     * 删除违章周统计
-     *
-     * @param id 违章周统计主键
-     * @return 结果
-     */
-    public int deletePdmReportIllegalWeekById(Long id);
-
-    /**
-     * 批量删除违章周统计
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deletePdmReportIllegalWeekByIds(Long[] ids);
-}

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

@@ -1,61 +0,0 @@
-package com.ruoyi.powerdistribution.mapper;
-
-import java.util.List;
-import com.ruoyi.powerdistribution.domain.PdmReportPlanNextWeek;
-
-/**
- * 下周工作计划统计Mapper接口
- *
- * @author ruoyi
- * @date 2024-11-29
- */
-public interface PdmReportPlanNextWeekMapper
-{
-    /**
-     * 查询下周工作计划统计
-     *
-     * @param id 下周工作计划统计主键
-     * @return 下周工作计划统计
-     */
-    public PdmReportPlanNextWeek selectPdmReportPlanNextWeekById(Long id);
-
-    /**
-     * 查询下周工作计划统计列表
-     *
-     * @param pdmReportPlanNextWeek 下周工作计划统计
-     * @return 下周工作计划统计集合
-     */
-    public List<PdmReportPlanNextWeek> selectPdmReportPlanNextWeekList(PdmReportPlanNextWeek pdmReportPlanNextWeek);
-
-    /**
-     * 新增下周工作计划统计
-     *
-     * @param pdmReportPlanNextWeek 下周工作计划统计
-     * @return 结果
-     */
-    public int insertPdmReportPlanNextWeek(PdmReportPlanNextWeek pdmReportPlanNextWeek);
-
-    /**
-     * 修改下周工作计划统计
-     *
-     * @param pdmReportPlanNextWeek 下周工作计划统计
-     * @return 结果
-     */
-    public int updatePdmReportPlanNextWeek(PdmReportPlanNextWeek pdmReportPlanNextWeek);
-
-    /**
-     * 删除下周工作计划统计
-     *
-     * @param id 下周工作计划统计主键
-     * @return 结果
-     */
-    public int deletePdmReportPlanNextWeekById(Long id);
-
-    /**
-     * 批量删除下周工作计划统计
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deletePdmReportPlanNextWeekByIds(Long[] ids);
-}

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

@@ -1,61 +0,0 @@
-package com.ruoyi.powerdistribution.mapper;
-
-import java.util.List;
-import com.ruoyi.powerdistribution.domain.PdmReportPlanWeek;
-
-/**
- * 工作计划完成情况周统计Mapper接口
- *
- * @author ruoyi
- * @date 2024-11-29
- */
-public interface PdmReportPlanWeekMapper
-{
-    /**
-     * 查询工作计划完成情况周统计
-     *
-     * @param id 工作计划完成情况周统计主键
-     * @return 工作计划完成情况周统计
-     */
-    public PdmReportPlanWeek selectPdmReportPlanWeekById(Long id);
-
-    /**
-     * 查询工作计划完成情况周统计列表
-     *
-     * @param pdmReportPlanWeek 工作计划完成情况周统计
-     * @return 工作计划完成情况周统计集合
-     */
-    public List<PdmReportPlanWeek> selectPdmReportPlanWeekList(PdmReportPlanWeek pdmReportPlanWeek);
-
-    /**
-     * 新增工作计划完成情况周统计
-     *
-     * @param pdmReportPlanWeek 工作计划完成情况周统计
-     * @return 结果
-     */
-    public int insertPdmReportPlanWeek(PdmReportPlanWeek pdmReportPlanWeek);
-
-    /**
-     * 修改工作计划完成情况周统计
-     *
-     * @param pdmReportPlanWeek 工作计划完成情况周统计
-     * @return 结果
-     */
-    public int updatePdmReportPlanWeek(PdmReportPlanWeek pdmReportPlanWeek);
-
-    /**
-     * 删除工作计划完成情况周统计
-     *
-     * @param id 工作计划完成情况周统计主键
-     * @return 结果
-     */
-    public int deletePdmReportPlanWeekById(Long id);
-
-    /**
-     * 批量删除工作计划完成情况周统计
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deletePdmReportPlanWeekByIds(Long[] ids);
-}

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

@@ -1,61 +0,0 @@
-package com.ruoyi.powerdistribution.service;
-
-import java.util.List;
-import com.ruoyi.powerdistribution.domain.PdmReportAppointmentWeek;
-
-/**
- * 履职周统计Service接口
- *
- * @author ruoyi
- * @date 2024-11-29
- */
-public interface IPdmReportAppointmentWeekService
-{
-    /**
-     * 查询履职周统计
-     *
-     * @param id 履职周统计主键
-     * @return 履职周统计
-     */
-    public PdmReportAppointmentWeek selectPdmReportAppointmentWeekById(Long id);
-
-    /**
-     * 查询履职周统计列表
-     *
-     * @param pdmReportAppointmentWeek 履职周统计
-     * @return 履职周统计集合
-     */
-    public List<PdmReportAppointmentWeek> selectPdmReportAppointmentWeekList(PdmReportAppointmentWeek pdmReportAppointmentWeek);
-
-    /**
-     * 新增履职周统计
-     *
-     * @param pdmReportAppointmentWeek 履职周统计
-     * @return 结果
-     */
-    public int insertPdmReportAppointmentWeek(PdmReportAppointmentWeek pdmReportAppointmentWeek);
-
-    /**
-     * 修改履职周统计
-     *
-     * @param pdmReportAppointmentWeek 履职周统计
-     * @return 结果
-     */
-    public int updatePdmReportAppointmentWeek(PdmReportAppointmentWeek pdmReportAppointmentWeek);
-
-    /**
-     * 批量删除履职周统计
-     *
-     * @param ids 需要删除的履职周统计主键集合
-     * @return 结果
-     */
-    public int deletePdmReportAppointmentWeekByIds(Long[] ids);
-
-    /**
-     * 删除履职周统计信息
-     *
-     * @param id 履职周统计主键
-     * @return 结果
-     */
-    public int deletePdmReportAppointmentWeekById(Long id);
-}

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

@@ -1,61 +0,0 @@
-package com.ruoyi.powerdistribution.service;
-
-import java.util.List;
-import com.ruoyi.powerdistribution.domain.PdmReportIllegalWeek;
-
-/**
- * 违章周统计Service接口
- *
- * @author ruoyi
- * @date 2024-11-29
- */
-public interface IPdmReportIllegalWeekService
-{
-    /**
-     * 查询违章周统计
-     *
-     * @param id 违章周统计主键
-     * @return 违章周统计
-     */
-    public PdmReportIllegalWeek selectPdmReportIllegalWeekById(Long id);
-
-    /**
-     * 查询违章周统计列表
-     *
-     * @param pdmReportIllegalWeek 违章周统计
-     * @return 违章周统计集合
-     */
-    public List<PdmReportIllegalWeek> selectPdmReportIllegalWeekList(PdmReportIllegalWeek pdmReportIllegalWeek);
-
-    /**
-     * 新增违章周统计
-     *
-     * @param pdmReportIllegalWeek 违章周统计
-     * @return 结果
-     */
-    public int insertPdmReportIllegalWeek(PdmReportIllegalWeek pdmReportIllegalWeek);
-
-    /**
-     * 修改违章周统计
-     *
-     * @param pdmReportIllegalWeek 违章周统计
-     * @return 结果
-     */
-    public int updatePdmReportIllegalWeek(PdmReportIllegalWeek pdmReportIllegalWeek);
-
-    /**
-     * 批量删除违章周统计
-     *
-     * @param ids 需要删除的违章周统计主键集合
-     * @return 结果
-     */
-    public int deletePdmReportIllegalWeekByIds(Long[] ids);
-
-    /**
-     * 删除违章周统计信息
-     *
-     * @param id 违章周统计主键
-     * @return 结果
-     */
-    public int deletePdmReportIllegalWeekById(Long id);
-}

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

@@ -1,61 +0,0 @@
-package com.ruoyi.powerdistribution.service;
-
-import java.util.List;
-import com.ruoyi.powerdistribution.domain.PdmReportPlanNextWeek;
-
-/**
- * 下周工作计划统计Service接口
- *
- * @author ruoyi
- * @date 2024-11-29
- */
-public interface IPdmReportPlanNextWeekService
-{
-    /**
-     * 查询下周工作计划统计
-     *
-     * @param id 下周工作计划统计主键
-     * @return 下周工作计划统计
-     */
-    public PdmReportPlanNextWeek selectPdmReportPlanNextWeekById(Long id);
-
-    /**
-     * 查询下周工作计划统计列表
-     *
-     * @param pdmReportPlanNextWeek 下周工作计划统计
-     * @return 下周工作计划统计集合
-     */
-    public List<PdmReportPlanNextWeek> selectPdmReportPlanNextWeekList(PdmReportPlanNextWeek pdmReportPlanNextWeek);
-
-    /**
-     * 新增下周工作计划统计
-     *
-     * @param pdmReportPlanNextWeek 下周工作计划统计
-     * @return 结果
-     */
-    public int insertPdmReportPlanNextWeek(PdmReportPlanNextWeek pdmReportPlanNextWeek);
-
-    /**
-     * 修改下周工作计划统计
-     *
-     * @param pdmReportPlanNextWeek 下周工作计划统计
-     * @return 结果
-     */
-    public int updatePdmReportPlanNextWeek(PdmReportPlanNextWeek pdmReportPlanNextWeek);
-
-    /**
-     * 批量删除下周工作计划统计
-     *
-     * @param ids 需要删除的下周工作计划统计主键集合
-     * @return 结果
-     */
-    public int deletePdmReportPlanNextWeekByIds(Long[] ids);
-
-    /**
-     * 删除下周工作计划统计信息
-     *
-     * @param id 下周工作计划统计主键
-     * @return 结果
-     */
-    public int deletePdmReportPlanNextWeekById(Long id);
-}

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

@@ -1,61 +0,0 @@
-package com.ruoyi.powerdistribution.service;
-
-import java.util.List;
-import com.ruoyi.powerdistribution.domain.PdmReportPlanWeek;
-
-/**
- * 工作计划完成情况周统计Service接口
- *
- * @author ruoyi
- * @date 2024-11-29
- */
-public interface IPdmReportPlanWeekService
-{
-    /**
-     * 查询工作计划完成情况周统计
-     *
-     * @param id 工作计划完成情况周统计主键
-     * @return 工作计划完成情况周统计
-     */
-    public PdmReportPlanWeek selectPdmReportPlanWeekById(Long id);
-
-    /**
-     * 查询工作计划完成情况周统计列表
-     *
-     * @param pdmReportPlanWeek 工作计划完成情况周统计
-     * @return 工作计划完成情况周统计集合
-     */
-    public List<PdmReportPlanWeek> selectPdmReportPlanWeekList(PdmReportPlanWeek pdmReportPlanWeek);
-
-    /**
-     * 新增工作计划完成情况周统计
-     *
-     * @param pdmReportPlanWeek 工作计划完成情况周统计
-     * @return 结果
-     */
-    public int insertPdmReportPlanWeek(PdmReportPlanWeek pdmReportPlanWeek);
-
-    /**
-     * 修改工作计划完成情况周统计
-     *
-     * @param pdmReportPlanWeek 工作计划完成情况周统计
-     * @return 结果
-     */
-    public int updatePdmReportPlanWeek(PdmReportPlanWeek pdmReportPlanWeek);
-
-    /**
-     * 批量删除工作计划完成情况周统计
-     *
-     * @param ids 需要删除的工作计划完成情况周统计主键集合
-     * @return 结果
-     */
-    public int deletePdmReportPlanWeekByIds(Long[] ids);
-
-    /**
-     * 删除工作计划完成情况周统计信息
-     *
-     * @param id 工作计划完成情况周统计主键
-     * @return 结果
-     */
-    public int deletePdmReportPlanWeekById(Long id);
-}

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

@@ -1,96 +0,0 @@
-package com.ruoyi.powerdistribution.service.impl;
-
-import java.util.List;
-import com.ruoyi.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.powerdistribution.mapper.PdmReportAppointmentWeekMapper;
-import com.ruoyi.powerdistribution.domain.PdmReportAppointmentWeek;
-import com.ruoyi.powerdistribution.service.IPdmReportAppointmentWeekService;
-
-/**
- * 履职周统计Service业务层处理
- *
- * @author ruoyi
- * @date 2024-11-29
- */
-@Service
-public class PdmReportAppointmentWeekServiceImpl implements IPdmReportAppointmentWeekService
-{
-    @Autowired
-    private PdmReportAppointmentWeekMapper pdmReportAppointmentWeekMapper;
-
-    /**
-     * 查询履职周统计
-     *
-     * @param id 履职周统计主键
-     * @return 履职周统计
-     */
-    @Override
-    public PdmReportAppointmentWeek selectPdmReportAppointmentWeekById(Long id)
-    {
-        return pdmReportAppointmentWeekMapper.selectPdmReportAppointmentWeekById(id);
-    }
-
-    /**
-     * 查询履职周统计列表
-     *
-     * @param pdmReportAppointmentWeek 履职周统计
-     * @return 履职周统计
-     */
-    @Override
-    public List<PdmReportAppointmentWeek> selectPdmReportAppointmentWeekList(PdmReportAppointmentWeek pdmReportAppointmentWeek)
-    {
-        return pdmReportAppointmentWeekMapper.selectPdmReportAppointmentWeekList(pdmReportAppointmentWeek);
-    }
-
-    /**
-     * 新增履职周统计
-     *
-     * @param pdmReportAppointmentWeek 履职周统计
-     * @return 结果
-     */
-    @Override
-    public int insertPdmReportAppointmentWeek(PdmReportAppointmentWeek pdmReportAppointmentWeek)
-    {
-        pdmReportAppointmentWeek.setCreateTime(DateUtils.getNowDate());
-        return pdmReportAppointmentWeekMapper.insertPdmReportAppointmentWeek(pdmReportAppointmentWeek);
-    }
-
-    /**
-     * 修改履职周统计
-     *
-     * @param pdmReportAppointmentWeek 履职周统计
-     * @return 结果
-     */
-    @Override
-    public int updatePdmReportAppointmentWeek(PdmReportAppointmentWeek pdmReportAppointmentWeek)
-    {
-        pdmReportAppointmentWeek.setUpdateTime(DateUtils.getNowDate());
-        return pdmReportAppointmentWeekMapper.updatePdmReportAppointmentWeek(pdmReportAppointmentWeek);
-    }
-
-    /**
-     * 批量删除履职周统计
-     *
-     * @param ids 需要删除的履职周统计主键
-     * @return 结果
-     */
-    @Override
-    public int deletePdmReportAppointmentWeekByIds(Long[] ids)
-    {
-        return pdmReportAppointmentWeekMapper.deletePdmReportAppointmentWeekByIds(ids);
-    }
-
-    /**
-     * 删除履职周统计信息
-     *
-     * @param id 履职周统计主键
-     * @return 结果
-     */
-    @Override
-    public int deletePdmReportAppointmentWeekById(Long id)
-    {
-        return pdmReportAppointmentWeekMapper.deletePdmReportAppointmentWeekById(id);
-    }
-}

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

@@ -1,96 +0,0 @@
-package com.ruoyi.powerdistribution.service.impl;
-
-import java.util.List;
-import com.ruoyi.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.powerdistribution.mapper.PdmReportIllegalWeekMapper;
-import com.ruoyi.powerdistribution.domain.PdmReportIllegalWeek;
-import com.ruoyi.powerdistribution.service.IPdmReportIllegalWeekService;
-
-/**
- * 违章周统计Service业务层处理
- *
- * @author ruoyi
- * @date 2024-11-29
- */
-@Service
-public class PdmReportIllegalWeekServiceImpl implements IPdmReportIllegalWeekService
-{
-    @Autowired
-    private PdmReportIllegalWeekMapper pdmReportIllegalWeekMapper;
-
-    /**
-     * 查询违章周统计
-     *
-     * @param id 违章周统计主键
-     * @return 违章周统计
-     */
-    @Override
-    public PdmReportIllegalWeek selectPdmReportIllegalWeekById(Long id)
-    {
-        return pdmReportIllegalWeekMapper.selectPdmReportIllegalWeekById(id);
-    }
-
-    /**
-     * 查询违章周统计列表
-     *
-     * @param pdmReportIllegalWeek 违章周统计
-     * @return 违章周统计
-     */
-    @Override
-    public List<PdmReportIllegalWeek> selectPdmReportIllegalWeekList(PdmReportIllegalWeek pdmReportIllegalWeek)
-    {
-        return pdmReportIllegalWeekMapper.selectPdmReportIllegalWeekList(pdmReportIllegalWeek);
-    }
-
-    /**
-     * 新增违章周统计
-     *
-     * @param pdmReportIllegalWeek 违章周统计
-     * @return 结果
-     */
-    @Override
-    public int insertPdmReportIllegalWeek(PdmReportIllegalWeek pdmReportIllegalWeek)
-    {
-        pdmReportIllegalWeek.setCreateTime(DateUtils.getNowDate());
-        return pdmReportIllegalWeekMapper.insertPdmReportIllegalWeek(pdmReportIllegalWeek);
-    }
-
-    /**
-     * 修改违章周统计
-     *
-     * @param pdmReportIllegalWeek 违章周统计
-     * @return 结果
-     */
-    @Override
-    public int updatePdmReportIllegalWeek(PdmReportIllegalWeek pdmReportIllegalWeek)
-    {
-        pdmReportIllegalWeek.setUpdateTime(DateUtils.getNowDate());
-        return pdmReportIllegalWeekMapper.updatePdmReportIllegalWeek(pdmReportIllegalWeek);
-    }
-
-    /**
-     * 批量删除违章周统计
-     *
-     * @param ids 需要删除的违章周统计主键
-     * @return 结果
-     */
-    @Override
-    public int deletePdmReportIllegalWeekByIds(Long[] ids)
-    {
-        return pdmReportIllegalWeekMapper.deletePdmReportIllegalWeekByIds(ids);
-    }
-
-    /**
-     * 删除违章周统计信息
-     *
-     * @param id 违章周统计主键
-     * @return 结果
-     */
-    @Override
-    public int deletePdmReportIllegalWeekById(Long id)
-    {
-        return pdmReportIllegalWeekMapper.deletePdmReportIllegalWeekById(id);
-    }
-}

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

@@ -1,96 +0,0 @@
-package com.ruoyi.powerdistribution.service.impl;
-
-import java.util.List;
-import com.ruoyi.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.powerdistribution.mapper.PdmReportPlanNextWeekMapper;
-import com.ruoyi.powerdistribution.domain.PdmReportPlanNextWeek;
-import com.ruoyi.powerdistribution.service.IPdmReportPlanNextWeekService;
-
-/**
- * 下周工作计划统计Service业务层处理
- *
- * @author ruoyi
- * @date 2024-11-29
- */
-@Service
-public class PdmReportPlanNextWeekServiceImpl implements IPdmReportPlanNextWeekService
-{
-    @Autowired
-    private PdmReportPlanNextWeekMapper pdmReportPlanNextWeekMapper;
-
-    /**
-     * 查询下周工作计划统计
-     *
-     * @param id 下周工作计划统计主键
-     * @return 下周工作计划统计
-     */
-    @Override
-    public PdmReportPlanNextWeek selectPdmReportPlanNextWeekById(Long id)
-    {
-        return pdmReportPlanNextWeekMapper.selectPdmReportPlanNextWeekById(id);
-    }
-
-    /**
-     * 查询下周工作计划统计列表
-     *
-     * @param pdmReportPlanNextWeek 下周工作计划统计
-     * @return 下周工作计划统计
-     */
-    @Override
-    public List<PdmReportPlanNextWeek> selectPdmReportPlanNextWeekList(PdmReportPlanNextWeek pdmReportPlanNextWeek)
-    {
-        return pdmReportPlanNextWeekMapper.selectPdmReportPlanNextWeekList(pdmReportPlanNextWeek);
-    }
-
-    /**
-     * 新增下周工作计划统计
-     *
-     * @param pdmReportPlanNextWeek 下周工作计划统计
-     * @return 结果
-     */
-    @Override
-    public int insertPdmReportPlanNextWeek(PdmReportPlanNextWeek pdmReportPlanNextWeek)
-    {
-        pdmReportPlanNextWeek.setCreateTime(DateUtils.getNowDate());
-        return pdmReportPlanNextWeekMapper.insertPdmReportPlanNextWeek(pdmReportPlanNextWeek);
-    }
-
-    /**
-     * 修改下周工作计划统计
-     *
-     * @param pdmReportPlanNextWeek 下周工作计划统计
-     * @return 结果
-     */
-    @Override
-    public int updatePdmReportPlanNextWeek(PdmReportPlanNextWeek pdmReportPlanNextWeek)
-    {
-        pdmReportPlanNextWeek.setUpdateTime(DateUtils.getNowDate());
-        return pdmReportPlanNextWeekMapper.updatePdmReportPlanNextWeek(pdmReportPlanNextWeek);
-    }
-
-    /**
-     * 批量删除下周工作计划统计
-     *
-     * @param ids 需要删除的下周工作计划统计主键
-     * @return 结果
-     */
-    @Override
-    public int deletePdmReportPlanNextWeekByIds(Long[] ids)
-    {
-        return pdmReportPlanNextWeekMapper.deletePdmReportPlanNextWeekByIds(ids);
-    }
-
-    /**
-     * 删除下周工作计划统计信息
-     *
-     * @param id 下周工作计划统计主键
-     * @return 结果
-     */
-    @Override
-    public int deletePdmReportPlanNextWeekById(Long id)
-    {
-        return pdmReportPlanNextWeekMapper.deletePdmReportPlanNextWeekById(id);
-    }
-}

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

@@ -1,96 +0,0 @@
-package com.ruoyi.powerdistribution.service.impl;
-
-import java.util.List;
-import com.ruoyi.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.powerdistribution.mapper.PdmReportPlanWeekMapper;
-import com.ruoyi.powerdistribution.domain.PdmReportPlanWeek;
-import com.ruoyi.powerdistribution.service.IPdmReportPlanWeekService;
-
-/**
- * 工作计划完成情况周统计Service业务层处理
- *
- * @author ruoyi
- * @date 2024-11-29
- */
-@Service
-public class PdmReportPlanWeekServiceImpl implements IPdmReportPlanWeekService
-{
-    @Autowired
-    private PdmReportPlanWeekMapper pdmReportPlanWeekMapper;
-
-    /**
-     * 查询工作计划完成情况周统计
-     *
-     * @param id 工作计划完成情况周统计主键
-     * @return 工作计划完成情况周统计
-     */
-    @Override
-    public PdmReportPlanWeek selectPdmReportPlanWeekById(Long id)
-    {
-        return pdmReportPlanWeekMapper.selectPdmReportPlanWeekById(id);
-    }
-
-    /**
-     * 查询工作计划完成情况周统计列表
-     *
-     * @param pdmReportPlanWeek 工作计划完成情况周统计
-     * @return 工作计划完成情况周统计
-     */
-    @Override
-    public List<PdmReportPlanWeek> selectPdmReportPlanWeekList(PdmReportPlanWeek pdmReportPlanWeek)
-    {
-        return pdmReportPlanWeekMapper.selectPdmReportPlanWeekList(pdmReportPlanWeek);
-    }
-
-    /**
-     * 新增工作计划完成情况周统计
-     *
-     * @param pdmReportPlanWeek 工作计划完成情况周统计
-     * @return 结果
-     */
-    @Override
-    public int insertPdmReportPlanWeek(PdmReportPlanWeek pdmReportPlanWeek)
-    {
-        pdmReportPlanWeek.setCreateTime(DateUtils.getNowDate());
-        return pdmReportPlanWeekMapper.insertPdmReportPlanWeek(pdmReportPlanWeek);
-    }
-
-    /**
-     * 修改工作计划完成情况周统计
-     *
-     * @param pdmReportPlanWeek 工作计划完成情况周统计
-     * @return 结果
-     */
-    @Override
-    public int updatePdmReportPlanWeek(PdmReportPlanWeek pdmReportPlanWeek)
-    {
-        pdmReportPlanWeek.setUpdateTime(DateUtils.getNowDate());
-        return pdmReportPlanWeekMapper.updatePdmReportPlanWeek(pdmReportPlanWeek);
-    }
-
-    /**
-     * 批量删除工作计划完成情况周统计
-     *
-     * @param ids 需要删除的工作计划完成情况周统计主键
-     * @return 结果
-     */
-    @Override
-    public int deletePdmReportPlanWeekByIds(Long[] ids)
-    {
-        return pdmReportPlanWeekMapper.deletePdmReportPlanWeekByIds(ids);
-    }
-
-    /**
-     * 删除工作计划完成情况周统计信息
-     *
-     * @param id 工作计划完成情况周统计主键
-     * @return 结果
-     */
-    @Override
-    public int deletePdmReportPlanWeekById(Long id)
-    {
-        return pdmReportPlanWeekMapper.deletePdmReportPlanWeekById(id);
-    }
-}

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

@@ -150,8 +150,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from pdm_work_organ t1
            LEFT JOIN (
             select
-                sum(if((to_post_in_place_person_typ_cd in ('2035002','2035004') and is_in_place = '1'),1,0)) boss_sum,
-                sum(if((to_post_in_place_person_typ_cd in ('2035003','2035005') and is_in_place = '1'),1,0)) manage_sum,
+                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,
                 submit_org_nm
             from pdm_work_plan_in_place t1,pdm_work_plan t2 where
@@ -209,8 +209,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                IFNULL(ttt3.city_check_sum,0) city_check_sum
         from (
              (select
-              sum(if((to_post_in_place_person_typ_cd in ('2035002','2035004') and is_in_place = '1'),1,0)) boss_sum,
-              sum(if((to_post_in_place_person_typ_cd in ('2035003','2035003') and is_in_place = '1'),1,0)) manage_sum,
+              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 pdm_work_plan_in_place t1,pdm_work_plan t2 where
                   t2.uuid = t1.relation_id

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

@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.powerdistribution.mapper.PdmReportAppointmentWeekMapper">
-
-    <resultMap type="PdmReportAppointmentWeek" id="PdmReportAppointmentWeekResult">
-        <result property="id"    column="id"    />
-        <result property="company"    column="company"    />
-        <result property="reportDate"    column="report_date"    />
-        <result property="reportEndDate"    column="report_end_date"    />
-        <result property="checkNum3"    column="check_num3"    />
-        <result property="checkNum4"    column="check_num4"    />
-        <result property="checkNum5"    column="check_num5"    />
-        <result property="bossSum"    column="boss_sum"    />
-        <result property="manageSum"    column="manage_sum"    />
-        <result property="problemSum"    column="problem_sum"    />
-        <result property="absentSum"    column="absent_sum"    />
-        <result property="cityCheckSum"    column="city_check_sum"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-    <sql id="selectPdmReportAppointmentWeekVo">
-        select id, company, report_date, report_end_date, check_num3, check_num4, check_num5, boss_sum, manage_sum, problem_sum, absent_sum, city_check_sum, create_by, create_time, update_by, update_time from pdm_report_appointment_week
-    </sql>
-
-    <select id="selectPdmReportAppointmentWeekList" parameterType="PdmReportAppointmentWeek" resultMap="PdmReportAppointmentWeekResult">
-        select * from (
-        <include refid="selectPdmReportAppointmentWeekVo"/>
-        <where>
-            <if test="company != null  and company != ''"> and company = #{company}</if>
-            <if test="reportDate != null  and reportDate != ''"> and report_date = #{reportDate}</if>
-            <if test="reportEndDate != null  and reportEndDate != ''"> and report_end_date = #{reportEndDate}</if>
-            <if test="checkNum3 != null "> and check_num3 = #{checkNum3}</if>
-            <if test="checkNum4 != null "> and check_num4 = #{checkNum4}</if>
-            <if test="checkNum5 != null "> and check_num5 = #{checkNum5}</if>
-            <if test="bossSum != null "> and boss_sum = #{bossSum}</if>
-            <if test="manageSum != null "> and manage_sum = #{manageSum}</if>
-            <if test="problemSum != null "> and problem_sum = #{problemSum}</if>
-            <if test="absentSum != null "> and absent_sum = #{absentSum}</if>
-            <if test="cityCheckSum != null "> and city_check_sum = #{cityCheckSum}</if>
-        </where>
-        UNION
-        SELECT
-        sum(id) as id,
-        '总计' as company,
-        report_date,
-        report_end_date,
-        sum(ifnull(check_num3,0)) check_num3,
-        sum(ifnull(check_num4,0)) check_num4,
-        sum(ifnull(check_num5,0)) check_num5,
-        sum(ifnull(boss_sum,0)) boss_sum,
-        sum(ifnull(manage_sum,0)) manage_sum,
-        sum(ifnull(problem_sum,0)) problem_sum,
-        sum(ifnull(absent_sum,0)) absent_sum,
-        sum(ifnull(city_check_sum,0)) city_check_sum,
-        null create_by ,
-        null create_time,
-        null update_by,
-        null update_time FROM
-        pdm_report_appointment_week
-        <where>
-            <if test="company != null  and company != ''"> and company = #{company}</if>
-            <if test="reportDate != null  and reportDate != ''"> and report_date = #{reportDate}</if>
-            <if test="reportEndDate != null  and reportEndDate != ''"> and report_end_date = #{reportEndDate}</if>
-            <if test="checkNum3 != null "> and check_num3 = #{checkNum3}</if>
-            <if test="checkNum4 != null "> and check_num4 = #{checkNum4}</if>
-            <if test="checkNum5 != null "> and check_num5 = #{checkNum5}</if>
-            <if test="bossSum != null "> and boss_sum = #{bossSum}</if>
-            <if test="manageSum != null "> and manage_sum = #{manageSum}</if>
-            <if test="problemSum != null "> and problem_sum = #{problemSum}</if>
-            <if test="absentSum != null "> and absent_sum = #{absentSum}</if>
-            <if test="cityCheckSum != null "> and city_check_sum = #{cityCheckSum}</if>
-        </where>
-        GROUP BY report_date) a order by id asc
-    </select>
-
-    <select id="selectPdmReportAppointmentWeekById" parameterType="Long" resultMap="PdmReportAppointmentWeekResult">
-        <include refid="selectPdmReportAppointmentWeekVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertPdmReportAppointmentWeek" parameterType="PdmReportAppointmentWeek" useGeneratedKeys="true" keyProperty="id">
-        insert into pdm_report_appointment_week
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="company != null">company,</if>
-            <if test="reportDate != null">report_date,</if>
-            <if test="reportEndDate != null">report_end_date,</if>
-            <if test="checkNum3 != null">check_num3,</if>
-            <if test="checkNum4 != null">check_num4,</if>
-            <if test="checkNum5 != null">check_num5,</if>
-            <if test="bossSum != null">boss_sum,</if>
-            <if test="manageSum != null">manage_sum,</if>
-            <if test="problemSum != null">problem_sum,</if>
-            <if test="absentSum != null">absent_sum,</if>
-            <if test="cityCheckSum != null">city_check_sum,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="company != null">#{company},</if>
-            <if test="reportDate != null">#{reportDate},</if>
-            <if test="reportEndDate != null">#{reportEndDate},</if>
-            <if test="checkNum3 != null">#{checkNum3},</if>
-            <if test="checkNum4 != null">#{checkNum4},</if>
-            <if test="checkNum5 != null">#{checkNum5},</if>
-            <if test="bossSum != null">#{bossSum},</if>
-            <if test="manageSum != null">#{manageSum},</if>
-            <if test="problemSum != null">#{problemSum},</if>
-            <if test="absentSum != null">#{absentSum},</if>
-            <if test="cityCheckSum != null">#{cityCheckSum},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-         </trim>
-    </insert>
-
-    <update id="updatePdmReportAppointmentWeek" parameterType="PdmReportAppointmentWeek">
-        update pdm_report_appointment_week
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="company != null">company = #{company},</if>
-            <if test="reportDate != null">report_date = #{reportDate},</if>
-            <if test="reportEndDate != null">report_end_date = #{reportEndDate},</if>
-            <if test="checkNum3 != null">check_num3 = #{checkNum3},</if>
-            <if test="checkNum4 != null">check_num4 = #{checkNum4},</if>
-            <if test="checkNum5 != null">check_num5 = #{checkNum5},</if>
-            <if test="bossSum != null">boss_sum = #{bossSum},</if>
-            <if test="manageSum != null">manage_sum = #{manageSum},</if>
-            <if test="problemSum != null">problem_sum = #{problemSum},</if>
-            <if test="absentSum != null">absent_sum = #{absentSum},</if>
-            <if test="cityCheckSum != null">city_check_sum = #{cityCheckSum},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deletePdmReportAppointmentWeekById" parameterType="Long">
-        delete from pdm_report_appointment_week where id = #{id}
-    </delete>
-
-    <delete id="deletePdmReportAppointmentWeekByIds" parameterType="String">
-        delete from pdm_report_appointment_week where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

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

@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.powerdistribution.mapper.PdmReportIllegalWeekMapper">
-
-    <resultMap type="PdmReportIllegalWeek" id="PdmReportIllegalWeekResult">
-        <result property="id"    column="id"    />
-        <result property="company"    column="company"    />
-        <result property="reportDate"    column="report_date"    />
-        <result property="reportEndDate"    column="report_end_date"    />
-        <result property="provinceNum1"    column="province_num1"    />
-        <result property="provinceNum2"    column="province_num2"    />
-        <result property="cityNum1"    column="city_num1"    />
-        <result property="cityNum2"    column="city_num2"    />
-        <result property="countyNum1"    column="county_num1"    />
-        <result property="countyNum2"    column="county_num2"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-    <sql id="selectPdmReportIllegalWeekVo">
-        select id, company, report_date, report_end_date, province_num1, province_num2, city_num1, city_num2, county_num1, county_num2, create_by, create_time, update_by, update_time from pdm_report_illegal_week
-    </sql>
-
-    <select id="selectPdmReportIllegalWeekList" parameterType="PdmReportIllegalWeek" resultMap="PdmReportIllegalWeekResult">
-        select * from (
-        <include refid="selectPdmReportIllegalWeekVo"/>
-        <where>
-            <if test="company != null  and company != ''"> and company = #{company}</if>
-            <if test="reportDate != null  and reportDate != ''"> and report_date = #{reportDate}</if>
-            <if test="reportEndDate != null  and reportEndDate != ''"> and report_end_date = #{reportEndDate}</if>
-            <if test="provinceNum1 != null "> and province_num1 = #{provinceNum1}</if>
-            <if test="provinceNum2 != null "> and province_num2 = #{provinceNum2}</if>
-            <if test="cityNum1 != null "> and city_num1 = #{cityNum1}</if>
-            <if test="cityNum2 != null "> and city_num2 = #{cityNum2}</if>
-            <if test="countyNum1 != null "> and county_num1 = #{countyNum1}</if>
-            <if test="countyNum2 != null "> and county_num2 = #{countyNum2}</if>
-        </where>
-        UNION
-        SELECT
-        sum(id) as id,
-        '总计' as company,
-        report_date,
-        report_end_date,
-        sum(ifnull(province_num1,0)) province_num1,
-        sum(ifnull(province_num2,0)) province_num2,
-        sum(ifnull(city_num1,0)) city_num1,
-        sum(ifnull(city_num2,0)) city_num2,
-        sum(ifnull(county_num1,0)) county_num1,
-        sum(ifnull(county_num2,0)) county_num2,
-        create_by ,
-        create_time,
-        update_by,
-        update_time FROM
-        pdm_report_illegal_week
-        <where>
-            <if test="company != null  and company != ''"> and company like concat('%', #{company}, '%')</if>
-            <if test="reportDate != null  and reportDate != ''"> and report_date = #{reportDate}</if>
-            <if test="provinceNum1 != null "> and province_num1 = #{provinceNum1}</if>
-            <if test="provinceNum2 != null "> and province_num2 = #{provinceNum2}</if>
-            <if test="cityNum1 != null "> and city_num1 = #{cityNum1}</if>
-            <if test="cityNum2 != null "> and city_num2 = #{cityNum2}</if>
-            <if test="countyNum1 != null "> and county_num1 = #{countyNum1}</if>
-            <if test="countyNum2 != null "> and county_num2 = #{countyNum2}</if>
-        </where> GROUP BY report_date) a order by id asc
-    </select>
-
-    <select id="selectPdmReportIllegalWeekById" parameterType="Long" resultMap="PdmReportIllegalWeekResult">
-        <include refid="selectPdmReportIllegalWeekVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertPdmReportIllegalWeek" parameterType="PdmReportIllegalWeek" useGeneratedKeys="true" keyProperty="id">
-        insert into pdm_report_illegal_week
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="company != null">company,</if>
-            <if test="reportDate != null">report_date,</if>
-            <if test="reportEndDate != null">report_end_date,</if>
-            <if test="provinceNum1 != null">province_num1,</if>
-            <if test="provinceNum2 != null">province_num2,</if>
-            <if test="cityNum1 != null">city_num1,</if>
-            <if test="cityNum2 != null">city_num2,</if>
-            <if test="countyNum1 != null">county_num1,</if>
-            <if test="countyNum2 != null">county_num2,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="company != null">#{company},</if>
-            <if test="reportDate != null">#{reportDate},</if>
-            <if test="reportEndDate != null">#{reportEndDate},</if>
-            <if test="provinceNum1 != null">#{provinceNum1},</if>
-            <if test="provinceNum2 != null">#{provinceNum2},</if>
-            <if test="cityNum1 != null">#{cityNum1},</if>
-            <if test="cityNum2 != null">#{cityNum2},</if>
-            <if test="countyNum1 != null">#{countyNum1},</if>
-            <if test="countyNum2 != null">#{countyNum2},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-         </trim>
-    </insert>
-
-    <update id="updatePdmReportIllegalWeek" parameterType="PdmReportIllegalWeek">
-        update pdm_report_illegal_week
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="company != null">company = #{company},</if>
-            <if test="reportDate != null">report_date = #{reportDate},</if>
-            <if test="reportEndDate != null">report_end_date = #{reportEndDate},</if>
-            <if test="provinceNum1 != null">province_num1 = #{provinceNum1},</if>
-            <if test="provinceNum2 != null">province_num2 = #{provinceNum2},</if>
-            <if test="cityNum1 != null">city_num1 = #{cityNum1},</if>
-            <if test="cityNum2 != null">city_num2 = #{cityNum2},</if>
-            <if test="countyNum1 != null">county_num1 = #{countyNum1},</if>
-            <if test="countyNum2 != null">county_num2 = #{countyNum2},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deletePdmReportIllegalWeekById" parameterType="Long">
-        delete from pdm_report_illegal_week where id = #{id}
-    </delete>
-
-    <delete id="deletePdmReportIllegalWeekByIds" parameterType="String">
-        delete from pdm_report_illegal_week where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

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

@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.powerdistribution.mapper.PdmReportPlanNextWeekMapper">
-
-    <resultMap type="PdmReportPlanNextWeek" id="PdmReportPlanNextWeekResult">
-        <result property="id"    column="id"    />
-        <result property="company"    column="company"    />
-        <result property="reportDate"    column="report_date"    />
-        <result property="reportEndDate"    column="report_end_date"    />
-        <result property="workTotal"    column="work_total"    />
-        <result property="workType1Sum"    column="work_type1_sum"    />
-        <result property="workType2Sum"    column="work_type2_sum"    />
-        <result property="workType3Sum"    column="work_type3_sum"    />
-        <result property="workType4Sum"    column="work_type4_sum"    />
-        <result property="workType5Sum"    column="work_type5_sum"    />
-        <result property="elePlanSum"    column="ele_plan_sum"    />
-        <result property="planLeve3"    column="plan_leve3"    />
-        <result property="planLeve4"    column="plan_leve4"    />
-        <result property="planLeve5"    column="plan_leve5"    />
-        <result property="checkDetail"    column="check_detail"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-    <sql id="selectPdmReportPlanNextWeekVo">
-        select id, company, report_date, report_end_date, work_total, work_type1_sum, work_type2_sum, work_type3_sum, work_type4_sum, work_type5_sum, ele_plan_sum, plan_leve3, plan_leve4, plan_leve5, check_detail, create_by, create_time, update_by, update_time from pdm_report_plan_next_week
-    </sql>
-
-    <select id="selectPdmReportPlanNextWeekList" parameterType="PdmReportPlanNextWeek" resultMap="PdmReportPlanNextWeekResult">
-        select * from (
-       <include refid="selectPdmReportPlanNextWeekVo"/>
-        <where>
-            <if test="company != null  and company != ''"> and company = #{company}</if>
-            <if test="reportDate != null  and reportDate != ''"> and report_date = #{reportDate}</if>
-            <if test="reportEndDate != null  and reportEndDate != ''"> and report_end_date = #{reportEndDate}</if>
-            <if test="workTotal != null "> and work_total = #{workTotal}</if>
-            <if test="workType1Sum != null "> and work_type1_sum = #{workType1Sum}</if>
-            <if test="workType2Sum != null "> and work_type2_sum = #{workType2Sum}</if>
-            <if test="workType3Sum != null "> and work_type3_sum = #{workType3Sum}</if>
-            <if test="workType4Sum != null "> and work_type4_sum = #{workType4Sum}</if>
-            <if test="workType5Sum != null "> and work_type5_sum = #{workType5Sum}</if>
-            <if test="elePlanSum != null "> and ele_plan_sum = #{elePlanSum}</if>
-            <if test="planLeve3 != null  and planLeve3 != ''"> and plan_leve3 = #{planLeve3}</if>
-            <if test="planLeve4 != null  and planLeve4 != ''"> and plan_leve4 = #{planLeve4}</if>
-            <if test="planLeve5 != null  and planLeve5 != ''"> and plan_leve5 = #{planLeve5}</if>
-            <if test="checkDetail != null  and checkDetail != ''"> and check_detail = #{checkDetail}</if>
-        </where>
-        UNION
-        SELECT
-        sum(id) as id,
-        '总计' as company,
-        report_date,
-        report_end_date,
-        sum(ifnull(work_total,0)) work_total,
-        sum(ifnull(work_type1_sum,0)) work_type1_sum,
-        sum(ifnull(work_type2_sum,0)) work_type2_sum,
-        sum(ifnull(work_type3_sum,0)) work_type3_sum,
-        sum(ifnull(work_type4_sum,0)) work_type4_sum,
-        sum(ifnull(work_type5_sum,0)) work_type5_sum,
-        sum(ifnull(ele_plan_sum,0)) ele_plan_sum,
-        sum(ifnull(plan_leve3,0)) plan_leve3,
-        sum(ifnull(plan_leve4,0)) plan_leve4,
-        sum(ifnull(plan_leve5,0)) plan_leve5,
-        null check_detail,
-        null create_by ,
-        null create_time,
-        null update_by,
-        null update_time FROM
-        pdm_report_plan_next_week
-        <where>
-            <if test="company != null  and company != ''"> and company = #{company}</if>
-            <if test="reportDate != null  and reportDate != ''"> and report_date = #{reportDate}</if>
-            <if test="reportEndDate != null  and reportEndDate != ''"> and report_end_date = #{reportEndDate}</if>
-            <if test="workTotal != null "> and work_total = #{workTotal}</if>
-            <if test="workType1Sum != null "> and work_type1_sum = #{workType1Sum}</if>
-            <if test="workType2Sum != null "> and work_type2_sum = #{workType2Sum}</if>
-            <if test="workType3Sum != null "> and work_type3_sum = #{workType3Sum}</if>
-            <if test="workType4Sum != null "> and work_type4_sum = #{workType4Sum}</if>
-            <if test="workType5Sum != null "> and work_type5_sum = #{workType5Sum}</if>
-            <if test="elePlanSum != null "> and ele_plan_sum = #{elePlanSum}</if>
-            <if test="planLeve3 != null  and planLeve3 != ''"> and plan_leve3 = #{planLeve3}</if>
-            <if test="planLeve4 != null  and planLeve4 != ''"> and plan_leve4 = #{planLeve4}</if>
-            <if test="planLeve5 != null  and planLeve5 != ''"> and plan_leve5 = #{planLeve5}</if>
-            <if test="checkDetail != null  and checkDetail != ''"> and check_detail = #{checkDetail}</if>
-        </where>
-        GROUP BY report_date) a order by id asc
-
-    </select>
-
-    <select id="selectPdmReportPlanNextWeekById" parameterType="Long" resultMap="PdmReportPlanNextWeekResult">
-        <include refid="selectPdmReportPlanNextWeekVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertPdmReportPlanNextWeek" parameterType="PdmReportPlanNextWeek" useGeneratedKeys="true" keyProperty="id">
-        insert into pdm_report_plan_next_week
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="company != null">company,</if>
-            <if test="reportDate != null">report_date,</if>
-            <if test="reportEndDate != null">report_end_date,</if>
-            <if test="workTotal != null">work_total,</if>
-            <if test="workType1Sum != null">work_type1_sum,</if>
-            <if test="workType2Sum != null">work_type2_sum,</if>
-            <if test="workType3Sum != null">work_type3_sum,</if>
-            <if test="workType4Sum != null">work_type4_sum,</if>
-            <if test="workType5Sum != null">work_type5_sum,</if>
-            <if test="elePlanSum != null">ele_plan_sum,</if>
-            <if test="planLeve3 != null">plan_leve3,</if>
-            <if test="planLeve4 != null">plan_leve4,</if>
-            <if test="planLeve5 != null">plan_leve5,</if>
-            <if test="checkDetail != null">check_detail,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="company != null">#{company},</if>
-            <if test="reportDate != null">#{reportDate},</if>
-            <if test="reportEndDate != null">#{reportEndDate},</if>
-            <if test="workTotal != null">#{workTotal},</if>
-            <if test="workType1Sum != null">#{workType1Sum},</if>
-            <if test="workType2Sum != null">#{workType2Sum},</if>
-            <if test="workType3Sum != null">#{workType3Sum},</if>
-            <if test="workType4Sum != null">#{workType4Sum},</if>
-            <if test="workType5Sum != null">#{workType5Sum},</if>
-            <if test="elePlanSum != null">#{elePlanSum},</if>
-            <if test="planLeve3 != null">#{planLeve3},</if>
-            <if test="planLeve4 != null">#{planLeve4},</if>
-            <if test="planLeve5 != null">#{planLeve5},</if>
-            <if test="checkDetail != null">#{checkDetail},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-         </trim>
-    </insert>
-
-    <update id="updatePdmReportPlanNextWeek" parameterType="PdmReportPlanNextWeek">
-        update pdm_report_plan_next_week
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="company != null">company = #{company},</if>
-            <if test="reportDate != null">report_date = #{reportDate},</if>
-            <if test="reportEndDate != null">report_end_date = #{reportEndDate},</if>
-            <if test="workTotal != null">work_total = #{workTotal},</if>
-            <if test="workType1Sum != null">work_type1_sum = #{workType1Sum},</if>
-            <if test="workType2Sum != null">work_type2_sum = #{workType2Sum},</if>
-            <if test="workType3Sum != null">work_type3_sum = #{workType3Sum},</if>
-            <if test="workType4Sum != null">work_type4_sum = #{workType4Sum},</if>
-            <if test="workType5Sum != null">work_type5_sum = #{workType5Sum},</if>
-            <if test="elePlanSum != null">ele_plan_sum = #{elePlanSum},</if>
-            <if test="planLeve3 != null">plan_leve3 = #{planLeve3},</if>
-            <if test="planLeve4 != null">plan_leve4 = #{planLeve4},</if>
-            <if test="planLeve5 != null">plan_leve5 = #{planLeve5},</if>
-            <if test="checkDetail != null">check_detail = #{checkDetail},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deletePdmReportPlanNextWeekById" parameterType="Long">
-        delete from pdm_report_plan_next_week where id = #{id}
-    </delete>
-
-    <delete id="deletePdmReportPlanNextWeekByIds" parameterType="String">
-        delete from pdm_report_plan_next_week where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>

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

@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.powerdistribution.mapper.PdmReportPlanWeekMapper">
-
-    <resultMap type="PdmReportPlanWeek" id="PdmReportPlanWeekResult">
-        <result property="id"    column="id"    />
-        <result property="company"    column="company"    />
-        <result property="reportDate"    column="report_date"    />
-        <result property="reportEndDate"    column="report_end_date"    />
-        <result property="total"    column="total"    />
-        <result property="weekSum"    column="week_sum"    />
-        <result property="weekCancelSum"    column="week_cancel_sum"    />
-        <result property="weekRatio"    column="week_ratio"    />
-        <result property="temporarySum"    column="temporary_sum"    />
-        <result property="temporaryCancelSum"    column="temporary_cancel_sum"    />
-        <result property="temporaryRatio"    column="temporary_ratio"    />
-        <result property="temporaryPlanRatio"    column="temporary_plan_ratio"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
-
-    <sql id="selectPdmReportPlanWeekVo">
-        select id, company, report_date, report_end_date, total, week_sum, week_cancel_sum, week_ratio, temporary_sum, temporary_cancel_sum, temporary_ratio, temporary_plan_ratio, create_by, create_time, update_by, update_time from pdm_report_plan_week
-    </sql>
-
-    <select id="selectPdmReportPlanWeekList" parameterType="PdmReportPlanWeek" resultMap="PdmReportPlanWeekResult">
-        select * from (
-        <include refid="selectPdmReportPlanWeekVo"/>
-        <where>
-            <if test="company != null  and company != ''"> and company = #{company}</if>
-            <if test="reportDate != null  and reportDate != ''"> and report_date = #{reportDate}</if>
-            <if test="reportEndDate != null  and reportEndDate != ''"> and report_end_date = #{reportEndDate}</if>
-            <if test="total != null "> and total = #{total}</if>
-            <if test="weekSum != null "> and week_sum = #{weekSum}</if>
-            <if test="weekCancelSum != null "> and week_cancel_sum = #{weekCancelSum}</if>
-            <if test="weekRatio != null  and weekRatio != ''"> and week_ratio = #{weekRatio}</if>
-            <if test="temporarySum != null "> and temporary_sum = #{temporarySum}</if>
-            <if test="temporaryCancelSum != null "> and temporary_cancel_sum = #{temporaryCancelSum}</if>
-            <if test="temporaryRatio != null  and temporaryRatio != ''"> and temporary_ratio = #{temporaryRatio}</if>
-            <if test="temporaryPlanRatio != null  and temporaryPlanRatio != ''"> and temporary_plan_ratio = #{temporaryPlanRatio}</if>
-        </where>
-        UNION
-        SELECT
-        sum(id) as id,
-        '总计' as company,
-        report_date,
-        report_end_date,
-        sum(ifnull(total,0)) total,
-        sum(ifnull(week_sum,0)) week_sum,
-        sum(ifnull(week_cancel_sum,0)) week_cancel_sum,
-        CONCAT(round((sum(ifnull(week_sum,0))-sum(ifnull(week_cancel_sum,0)))/sum(ifnull(week_sum,0))*100,2),'%')  week_ratio,
-        sum(ifnull(temporary_sum,0)) temporary_sum,
-        sum(ifnull(temporary_cancel_sum,0)) temporary_cancel_sum,
-        CONCAT(round((sum(ifnull(temporary_sum,0))-sum(ifnull(temporary_cancel_sum,0)))/sum(ifnull(temporary_sum,0))*100,2),'%')  temporary_ratio,
-        CONCAT(round(sum(ifnull(temporary_sum,0))/(sum(ifnull(week_sum,0))+sum(ifnull(temporary_sum,0)))*100,2),'%') temporary_plan_ratio,
-        null create_by ,
-        null create_time,
-        null update_by,
-        null update_time FROM
-        pdm_report_plan_week
-        <where>
-            <if test="company != null  and company != ''"> and company = #{company}</if>
-            <if test="reportDate != null  and reportDate != ''"> and report_date = #{reportDate}</if>
-            <if test="reportEndDate != null  and reportEndDate != ''"> and report_end_date = #{reportEndDate}</if>
-            <if test="total != null "> and total = #{total}</if>
-            <if test="weekSum != null "> and week_sum = #{weekSum}</if>
-            <if test="weekCancelSum != null "> and week_cancel_sum = #{weekCancelSum}</if>
-            <if test="weekRatio != null  and weekRatio != ''"> and week_ratio = #{weekRatio}</if>
-            <if test="temporarySum != null "> and temporary_sum = #{temporarySum}</if>
-            <if test="temporaryCancelSum != null "> and temporary_cancel_sum = #{temporaryCancelSum}</if>
-            <if test="temporaryRatio != null  and temporaryRatio != ''"> and temporary_ratio = #{temporaryRatio}</if>
-            <if test="temporaryPlanRatio != null  and temporaryPlanRatio != ''"> and temporary_plan_ratio = #{temporaryPlanRatio}</if>
-        </where>
-        GROUP BY report_date) a order by id asc
-    </select>
-
-    <select id="selectPdmReportPlanWeekById" parameterType="Long" resultMap="PdmReportPlanWeekResult">
-        <include refid="selectPdmReportPlanWeekVo"/>
-        where id = #{id}
-    </select>
-
-    <insert id="insertPdmReportPlanWeek" parameterType="PdmReportPlanWeek" useGeneratedKeys="true" keyProperty="id">
-        insert into pdm_report_plan_week
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="company != null">company,</if>
-            <if test="reportDate != null">report_date,</if>
-            <if test="reportEndDate != null">report_end_date,</if>
-            <if test="total != null">total,</if>
-            <if test="weekSum != null">week_sum,</if>
-            <if test="weekCancelSum != null">week_cancel_sum,</if>
-            <if test="weekRatio != null">week_ratio,</if>
-            <if test="temporarySum != null">temporary_sum,</if>
-            <if test="temporaryCancelSum != null">temporary_cancel_sum,</if>
-            <if test="temporaryRatio != null">temporary_ratio,</if>
-            <if test="temporaryPlanRatio != null">temporary_plan_ratio,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="company != null">#{company},</if>
-            <if test="reportDate != null">#{reportDate},</if>
-            <if test="reportEndDate != null">#{reportEndDate},</if>
-            <if test="total != null">#{total},</if>
-            <if test="weekSum != null">#{weekSum},</if>
-            <if test="weekCancelSum != null">#{weekCancelSum},</if>
-            <if test="weekRatio != null">#{weekRatio},</if>
-            <if test="temporarySum != null">#{temporarySum},</if>
-            <if test="temporaryCancelSum != null">#{temporaryCancelSum},</if>
-            <if test="temporaryRatio != null">#{temporaryRatio},</if>
-            <if test="temporaryPlanRatio != null">#{temporaryPlanRatio},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-         </trim>
-    </insert>
-
-    <update id="updatePdmReportPlanWeek" parameterType="PdmReportPlanWeek">
-        update pdm_report_plan_week
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="company != null">company = #{company},</if>
-            <if test="reportDate != null">report_date = #{reportDate},</if>
-            <if test="reportEndDate != null">report_end_date = #{reportEndDate},</if>
-            <if test="total != null">total = #{total},</if>
-            <if test="weekSum != null">week_sum = #{weekSum},</if>
-            <if test="weekCancelSum != null">week_cancel_sum = #{weekCancelSum},</if>
-            <if test="weekRatio != null">week_ratio = #{weekRatio},</if>
-            <if test="temporarySum != null">temporary_sum = #{temporarySum},</if>
-            <if test="temporaryCancelSum != null">temporary_cancel_sum = #{temporaryCancelSum},</if>
-            <if test="temporaryRatio != null">temporary_ratio = #{temporaryRatio},</if>
-            <if test="temporaryPlanRatio != null">temporary_plan_ratio = #{temporaryPlanRatio},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deletePdmReportPlanWeekById" parameterType="Long">
-        delete from pdm_report_plan_week where id = #{id}
-    </delete>
-
-    <delete id="deletePdmReportPlanWeekByIds" parameterType="String">
-        delete from pdm_report_plan_week where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-</mapper>