积分统计提交

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

@@ -0,0 +1,116 @@
+package com.ruoyi.powerdistribution.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+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.PdmScoreRankManager;
+import com.ruoyi.powerdistribution.service.IPdmScoreRankManagerService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 负责人积分排名Controller
+ *
+ * @author ruoyi
+ * @date 2024-12-05
+ */
+@RestController
+@RequestMapping("/power/managerRank")
+public class PdmScoreRankManagerController extends BaseController
+{
+    @Autowired
+    private IPdmScoreRankManagerService pdmScoreRankManagerService;
+
+    /**
+     * 查询负责人积分排名列表
+     */
+    @ApiOperation(value = "查询负责人积分排名列表")
+    @PreAuthorize("@ss.hasPermi('system:manager:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(PdmScoreRankManager pdmScoreRankManager)
+    {
+        startPage();
+        List<PdmScoreRankManager> list = pdmScoreRankManagerService.selectPdmScoreRankManagerList(pdmScoreRankManager);
+        PageInfo pageInfo =  new PageInfo(list);
+        int pageNum = pageInfo.getPageNum();
+        int i = 1;
+        for(PdmScoreRankManager manager:list){
+            int rankNum = pageNum!=1?(pageNum-1)*pageInfo.getPageSize()*i:i;
+            manager.setRankNum(rankNum);
+            i++;
+        }
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出负责人积分排名列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:manager:export')")
+    @Log(title = "负责人积分排名", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, PdmScoreRankManager pdmScoreRankManager)
+    {
+        List<PdmScoreRankManager> list = pdmScoreRankManagerService.selectPdmScoreRankManagerList(pdmScoreRankManager);
+        ExcelUtil<PdmScoreRankManager> util = new ExcelUtil<PdmScoreRankManager>(PdmScoreRankManager.class);
+        util.exportExcel(response, list, "负责人积分排名数据");
+    }
+
+    /**
+     * 获取负责人积分排名详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:manager:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(pdmScoreRankManagerService.selectPdmScoreRankManagerById(id));
+    }
+
+    /**
+     * 新增负责人积分排名
+     */
+    @PreAuthorize("@ss.hasPermi('system:manager:add')")
+    @Log(title = "负责人积分排名", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody PdmScoreRankManager pdmScoreRankManager)
+    {
+        return toAjax(pdmScoreRankManagerService.insertPdmScoreRankManager(pdmScoreRankManager));
+    }
+
+    /**
+     * 修改负责人积分排名
+     */
+    @PreAuthorize("@ss.hasPermi('system:manager:edit')")
+    @Log(title = "负责人积分排名", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody PdmScoreRankManager pdmScoreRankManager)
+    {
+        return toAjax(pdmScoreRankManagerService.updatePdmScoreRankManager(pdmScoreRankManager));
+    }
+
+    /**
+     * 删除负责人积分排名
+     */
+    @PreAuthorize("@ss.hasPermi('system:manager:remove')")
+    @Log(title = "负责人积分排名", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(pdmScoreRankManagerService.deletePdmScoreRankManagerByIds(ids));
+    }
+}

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

@@ -0,0 +1,117 @@
+package com.ruoyi.powerdistribution.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.github.pagehelper.PageInfo;
+import com.ruoyi.powerdistribution.domain.PdmScoreRankManager;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+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.PdmScoreRankTeam;
+import com.ruoyi.powerdistribution.service.IPdmScoreRankTeamService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 队伍积分排名Controller
+ *
+ * @author ruoyi
+ * @date 2024-12-05
+ */
+@RestController
+@RequestMapping("/power/teamRank")
+public class PdmScoreRankTeamController extends BaseController
+{
+    @Autowired
+    private IPdmScoreRankTeamService pdmScoreRankTeamService;
+
+    /**
+     * 查询队伍积分排名列表
+     */
+    @ApiOperation(value = "查询队伍积分排名列表")
+    @PreAuthorize("@ss.hasPermi('system:team:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(PdmScoreRankTeam pdmScoreRankTeam)
+    {
+        startPage();
+        List<PdmScoreRankTeam> list = pdmScoreRankTeamService.selectPdmScoreRankTeamList(pdmScoreRankTeam);
+        PageInfo pageInfo =  new PageInfo(list);
+        int pageNum = pageInfo.getPageNum();
+        int i = 1;
+        for(PdmScoreRankTeam manager:list){
+            int rankNum = pageNum!=1?(pageNum-1)*pageInfo.getPageSize()*i:i;
+            manager.setRankNum(rankNum);
+            i++;
+        }
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出队伍积分排名列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:team:export')")
+    @Log(title = "队伍积分排名", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, PdmScoreRankTeam pdmScoreRankTeam)
+    {
+        List<PdmScoreRankTeam> list = pdmScoreRankTeamService.selectPdmScoreRankTeamList(pdmScoreRankTeam);
+        ExcelUtil<PdmScoreRankTeam> util = new ExcelUtil<PdmScoreRankTeam>(PdmScoreRankTeam.class);
+        util.exportExcel(response, list, "队伍积分排名数据");
+    }
+
+    /**
+     * 获取队伍积分排名详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:team:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(pdmScoreRankTeamService.selectPdmScoreRankTeamById(id));
+    }
+
+    /**
+     * 新增队伍积分排名
+     */
+    @PreAuthorize("@ss.hasPermi('system:team:add')")
+    @Log(title = "队伍积分排名", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody PdmScoreRankTeam pdmScoreRankTeam)
+    {
+        return toAjax(pdmScoreRankTeamService.insertPdmScoreRankTeam(pdmScoreRankTeam));
+    }
+
+    /**
+     * 修改队伍积分排名
+     */
+    @PreAuthorize("@ss.hasPermi('system:team:edit')")
+    @Log(title = "队伍积分排名", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody PdmScoreRankTeam pdmScoreRankTeam)
+    {
+        return toAjax(pdmScoreRankTeamService.updatePdmScoreRankTeam(pdmScoreRankTeam));
+    }
+
+    /**
+     * 删除队伍积分排名
+     */
+    @PreAuthorize("@ss.hasPermi('system:team:remove')")
+    @Log(title = "队伍积分排名", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(pdmScoreRankTeamService.deletePdmScoreRankTeamByIds(ids));
+    }
+}

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

@@ -0,0 +1,117 @@
+package com.ruoyi.powerdistribution.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.github.pagehelper.PageInfo;
+import com.ruoyi.powerdistribution.domain.PdmScoreRankTeam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+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.PdmScoreRankWorker;
+import com.ruoyi.powerdistribution.service.IPdmScoreRankWorkerService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 作业人员积分排名Controller
+ *
+ * @author ruoyi
+ * @date 2024-12-05
+ */
+@RestController
+@RequestMapping("/power/workerRank")
+public class PdmScoreRankWorkerController extends BaseController
+{
+    @Autowired
+    private IPdmScoreRankWorkerService pdmScoreRankWorkerService;
+
+    /**
+     * 查询作业人员积分排名列表
+     */
+    @ApiOperation(value = "查询作业人员积分排名列表")
+    @PreAuthorize("@ss.hasPermi('system:worker:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(PdmScoreRankWorker pdmScoreRankWorker)
+    {
+        startPage();
+        List<PdmScoreRankWorker> list = pdmScoreRankWorkerService.selectPdmScoreRankWorkerList(pdmScoreRankWorker);
+        PageInfo pageInfo =  new PageInfo(list);
+        int pageNum = pageInfo.getPageNum();
+        int i = 1;
+        for(PdmScoreRankWorker manager:list){
+            int rankNum = pageNum!=1?(pageNum-1)*pageInfo.getPageSize()*i:i;
+            manager.setRankNum(rankNum);
+            i++;
+        }
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出作业人员积分排名列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:worker:export')")
+    @Log(title = "作业人员积分排名", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, PdmScoreRankWorker pdmScoreRankWorker)
+    {
+        List<PdmScoreRankWorker> list = pdmScoreRankWorkerService.selectPdmScoreRankWorkerList(pdmScoreRankWorker);
+        ExcelUtil<PdmScoreRankWorker> util = new ExcelUtil<PdmScoreRankWorker>(PdmScoreRankWorker.class);
+        util.exportExcel(response, list, "作业人员积分排名数据");
+    }
+
+    /**
+     * 获取作业人员积分排名详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:worker:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(pdmScoreRankWorkerService.selectPdmScoreRankWorkerById(id));
+    }
+
+    /**
+     * 新增作业人员积分排名
+     */
+    @PreAuthorize("@ss.hasPermi('system:worker:add')")
+    @Log(title = "作业人员积分排名", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody PdmScoreRankWorker pdmScoreRankWorker)
+    {
+        return toAjax(pdmScoreRankWorkerService.insertPdmScoreRankWorker(pdmScoreRankWorker));
+    }
+
+    /**
+     * 修改作业人员积分排名
+     */
+    @PreAuthorize("@ss.hasPermi('system:worker:edit')")
+    @Log(title = "作业人员积分排名", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody PdmScoreRankWorker pdmScoreRankWorker)
+    {
+        return toAjax(pdmScoreRankWorkerService.updatePdmScoreRankWorker(pdmScoreRankWorker));
+    }
+
+    /**
+     * 删除作业人员积分排名
+     */
+    @PreAuthorize("@ss.hasPermi('system:worker:remove')")
+    @Log(title = "作业人员积分排名", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(pdmScoreRankWorkerService.deletePdmScoreRankWorkerByIds(ids));
+    }
+}

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

@@ -0,0 +1,152 @@
+package com.ruoyi.powerdistribution.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 负责人积分排名对象 pdm_score_rank_manager
+ *
+ * @author ruoyi
+ * @date 2024-12-05
+ */
+public class PdmScoreRankManager extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 统计年 */
+    @Excel(name = "统计年")
+    private String reportYear;
+
+    /** 统计年月 */
+    @Excel(name = "统计年月")
+    private String reportDate;
+
+    /** 作业单位编码 */
+    @Excel(name = "作业单位编码")
+    private String companyNo;
+
+    /** 作业单位名称 */
+    @Excel(name = "作业单位名称")
+    private String companyName;
+
+    /** 负责人ID */
+    @Excel(name = "负责人ID")
+    private String managerId;
+
+    /** 负责人名称 */
+    @Excel(name = "负责人名称")
+    private String managerName;
+
+    /** 得分 */
+    @Excel(name = "得分")
+    private BigDecimal score;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private int rankNum;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setReportYear(String reportYear)
+    {
+        this.reportYear = reportYear;
+    }
+
+    public String getReportYear()
+    {
+        return reportYear;
+    }
+    public void setReportDate(String reportDate)
+    {
+        this.reportDate = reportDate;
+    }
+
+    public String getReportDate()
+    {
+        return reportDate;
+    }
+    public void setCompanyNo(String companyNo)
+    {
+        this.companyNo = companyNo;
+    }
+
+    public String getCompanyNo()
+    {
+        return companyNo;
+    }
+    public void setCompanyName(String companyName)
+    {
+        this.companyName = companyName;
+    }
+
+    public String getCompanyName()
+    {
+        return companyName;
+    }
+    public void setManagerId(String managerId)
+    {
+        this.managerId = managerId;
+    }
+
+    public String getManagerId()
+    {
+        return managerId;
+    }
+    public void setManagerName(String managerName)
+    {
+        this.managerName = managerName;
+    }
+
+    public String getManagerName()
+    {
+        return managerName;
+    }
+    public void setScore(BigDecimal score)
+    {
+        this.score = score;
+    }
+
+    public BigDecimal getScore()
+    {
+        return score;
+    }
+
+    public int getRankNum() {
+        return rankNum;
+    }
+
+    public void setRankNum(int rankNum) {
+        this.rankNum = rankNum;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("reportYear", getReportYear())
+            .append("reportDate", getReportDate())
+            .append("companyNo", getCompanyNo())
+            .append("companyName", getCompanyName())
+            .append("managerId", getManagerId())
+            .append("managerName", getManagerName())
+            .append("score", getScore())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

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

@@ -0,0 +1,152 @@
+package com.ruoyi.powerdistribution.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 队伍积分排名对象 pdm_score_rank_team
+ *
+ * @author ruoyi
+ * @date 2024-12-05
+ */
+public class PdmScoreRankTeam extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 统计年 */
+    @Excel(name = "统计年")
+    private String reportYear;
+
+    /** 统计年月 */
+    @Excel(name = "统计年月")
+    private String reportDate;
+
+    /** 作业单位编码 */
+    @Excel(name = "作业单位编码")
+    private String companyNo;
+
+    /** 作业单位名称 */
+    @Excel(name = "作业单位名称")
+    private String companyName;
+
+    /** 队伍ID */
+    @Excel(name = "队伍ID")
+    private String teamId;
+
+    /** 队伍名称 */
+    @Excel(name = "队伍名称")
+    private String teamName;
+
+    /** 得分 */
+    @Excel(name = "得分")
+    private BigDecimal score;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private int rankNum;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setReportYear(String reportYear)
+    {
+        this.reportYear = reportYear;
+    }
+
+    public String getReportYear()
+    {
+        return reportYear;
+    }
+    public void setReportDate(String reportDate)
+    {
+        this.reportDate = reportDate;
+    }
+
+    public String getReportDate()
+    {
+        return reportDate;
+    }
+    public void setCompanyNo(String companyNo)
+    {
+        this.companyNo = companyNo;
+    }
+
+    public String getCompanyNo()
+    {
+        return companyNo;
+    }
+    public void setCompanyName(String companyName)
+    {
+        this.companyName = companyName;
+    }
+
+    public String getCompanyName()
+    {
+        return companyName;
+    }
+    public void setTeamId(String teamId)
+    {
+        this.teamId = teamId;
+    }
+
+    public String getTeamId()
+    {
+        return teamId;
+    }
+    public void setTeamName(String teamName)
+    {
+        this.teamName = teamName;
+    }
+
+    public String getTeamName()
+    {
+        return teamName;
+    }
+    public void setScore(BigDecimal score)
+    {
+        this.score = score;
+    }
+
+    public BigDecimal getScore()
+    {
+        return score;
+    }
+
+    public int getRankNum() {
+        return rankNum;
+    }
+
+    public void setRankNum(int rankNum) {
+        this.rankNum = rankNum;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("reportYear", getReportYear())
+            .append("reportDate", getReportDate())
+            .append("companyNo", getCompanyNo())
+            .append("companyName", getCompanyName())
+            .append("teamId", getTeamId())
+            .append("teamName", getTeamName())
+            .append("score", getScore())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

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

@@ -0,0 +1,152 @@
+package com.ruoyi.powerdistribution.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 作业人员积分排名对象 pdm_score_rank_worker
+ *
+ * @author ruoyi
+ * @date 2024-12-05
+ */
+public class PdmScoreRankWorker extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 统计年 */
+    @Excel(name = "统计年")
+    private String reportYear;
+
+    /** 统计年月 */
+    @Excel(name = "统计年月")
+    private String reportDate;
+
+    /** 作业单位编码 */
+    @Excel(name = "作业单位编码")
+    private String companyNo;
+
+    /** 作业单位名称 */
+    @Excel(name = "作业单位名称")
+    private String companyName;
+
+    /** 作业人员ID */
+    @Excel(name = "作业人员ID")
+    private String workUserId;
+
+    /** 作业人员名称 */
+    @Excel(name = "作业人员名称")
+    private String workUserName;
+
+    /** 得分 */
+    @Excel(name = "得分")
+    private BigDecimal score;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private int rankNum;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setReportYear(String reportYear)
+    {
+        this.reportYear = reportYear;
+    }
+
+    public String getReportYear()
+    {
+        return reportYear;
+    }
+    public void setReportDate(String reportDate)
+    {
+        this.reportDate = reportDate;
+    }
+
+    public String getReportDate()
+    {
+        return reportDate;
+    }
+    public void setCompanyNo(String companyNo)
+    {
+        this.companyNo = companyNo;
+    }
+
+    public String getCompanyNo()
+    {
+        return companyNo;
+    }
+    public void setCompanyName(String companyName)
+    {
+        this.companyName = companyName;
+    }
+
+    public String getCompanyName()
+    {
+        return companyName;
+    }
+    public void setWorkUserId(String workUserId)
+    {
+        this.workUserId = workUserId;
+    }
+
+    public String getWorkUserId()
+    {
+        return workUserId;
+    }
+    public void setWorkUserName(String workUserName)
+    {
+        this.workUserName = workUserName;
+    }
+
+    public String getWorkUserName()
+    {
+        return workUserName;
+    }
+    public void setScore(BigDecimal score)
+    {
+        this.score = score;
+    }
+
+    public BigDecimal getScore()
+    {
+        return score;
+    }
+
+    public int getRankNum() {
+        return rankNum;
+    }
+
+    public void setRankNum(int rankNum) {
+        this.rankNum = rankNum;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("reportYear", getReportYear())
+            .append("reportDate", getReportDate())
+            .append("companyNo", getCompanyNo())
+            .append("companyName", getCompanyName())
+            .append("workUserId", getWorkUserId())
+            .append("workUserName", getWorkUserName())
+            .append("score", getScore())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.powerdistribution.mapper;
+
+import java.util.List;
+import com.ruoyi.powerdistribution.domain.PdmScoreRankManager;
+
+/**
+ * 负责人积分排名Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-12-05
+ */
+public interface PdmScoreRankManagerMapper
+{
+    /**
+     * 查询负责人积分排名
+     *
+     * @param id 负责人积分排名主键
+     * @return 负责人积分排名
+     */
+    public PdmScoreRankManager selectPdmScoreRankManagerById(Long id);
+
+    /**
+     * 查询负责人积分排名列表
+     *
+     * @param pdmScoreRankManager 负责人积分排名
+     * @return 负责人积分排名集合
+     */
+    public List<PdmScoreRankManager> selectPdmScoreRankManagerList(PdmScoreRankManager pdmScoreRankManager);
+
+    /**
+     * 新增负责人积分排名
+     *
+     * @param pdmScoreRankManager 负责人积分排名
+     * @return 结果
+     */
+    public int insertPdmScoreRankManager(PdmScoreRankManager pdmScoreRankManager);
+
+    /**
+     * 修改负责人积分排名
+     *
+     * @param pdmScoreRankManager 负责人积分排名
+     * @return 结果
+     */
+    public int updatePdmScoreRankManager(PdmScoreRankManager pdmScoreRankManager);
+
+    /**
+     * 删除负责人积分排名
+     *
+     * @param id 负责人积分排名主键
+     * @return 结果
+     */
+    public int deletePdmScoreRankManagerById(Long id);
+
+    /**
+     * 批量删除负责人积分排名
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deletePdmScoreRankManagerByIds(Long[] ids);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.powerdistribution.mapper;
+
+import java.util.List;
+import com.ruoyi.powerdistribution.domain.PdmScoreRankTeam;
+
+/**
+ * 队伍积分排名Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-12-05
+ */
+public interface PdmScoreRankTeamMapper
+{
+    /**
+     * 查询队伍积分排名
+     *
+     * @param id 队伍积分排名主键
+     * @return 队伍积分排名
+     */
+    public PdmScoreRankTeam selectPdmScoreRankTeamById(Long id);
+
+    /**
+     * 查询队伍积分排名列表
+     *
+     * @param pdmScoreRankTeam 队伍积分排名
+     * @return 队伍积分排名集合
+     */
+    public List<PdmScoreRankTeam> selectPdmScoreRankTeamList(PdmScoreRankTeam pdmScoreRankTeam);
+
+    /**
+     * 新增队伍积分排名
+     *
+     * @param pdmScoreRankTeam 队伍积分排名
+     * @return 结果
+     */
+    public int insertPdmScoreRankTeam(PdmScoreRankTeam pdmScoreRankTeam);
+
+    /**
+     * 修改队伍积分排名
+     *
+     * @param pdmScoreRankTeam 队伍积分排名
+     * @return 结果
+     */
+    public int updatePdmScoreRankTeam(PdmScoreRankTeam pdmScoreRankTeam);
+
+    /**
+     * 删除队伍积分排名
+     *
+     * @param id 队伍积分排名主键
+     * @return 结果
+     */
+    public int deletePdmScoreRankTeamById(Long id);
+
+    /**
+     * 批量删除队伍积分排名
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deletePdmScoreRankTeamByIds(Long[] ids);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.powerdistribution.mapper;
+
+import java.util.List;
+import com.ruoyi.powerdistribution.domain.PdmScoreRankWorker;
+
+/**
+ * 作业人员积分排名Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-12-05
+ */
+public interface PdmScoreRankWorkerMapper
+{
+    /**
+     * 查询作业人员积分排名
+     *
+     * @param id 作业人员积分排名主键
+     * @return 作业人员积分排名
+     */
+    public PdmScoreRankWorker selectPdmScoreRankWorkerById(Long id);
+
+    /**
+     * 查询作业人员积分排名列表
+     *
+     * @param pdmScoreRankWorker 作业人员积分排名
+     * @return 作业人员积分排名集合
+     */
+    public List<PdmScoreRankWorker> selectPdmScoreRankWorkerList(PdmScoreRankWorker pdmScoreRankWorker);
+
+    /**
+     * 新增作业人员积分排名
+     *
+     * @param pdmScoreRankWorker 作业人员积分排名
+     * @return 结果
+     */
+    public int insertPdmScoreRankWorker(PdmScoreRankWorker pdmScoreRankWorker);
+
+    /**
+     * 修改作业人员积分排名
+     *
+     * @param pdmScoreRankWorker 作业人员积分排名
+     * @return 结果
+     */
+    public int updatePdmScoreRankWorker(PdmScoreRankWorker pdmScoreRankWorker);
+
+    /**
+     * 删除作业人员积分排名
+     *
+     * @param id 作业人员积分排名主键
+     * @return 结果
+     */
+    public int deletePdmScoreRankWorkerById(Long id);
+
+    /**
+     * 批量删除作业人员积分排名
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deletePdmScoreRankWorkerByIds(Long[] ids);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.powerdistribution.service;
+
+import java.util.List;
+import com.ruoyi.powerdistribution.domain.PdmScoreRankManager;
+
+/**
+ * 负责人积分排名Service接口
+ *
+ * @author ruoyi
+ * @date 2024-12-05
+ */
+public interface IPdmScoreRankManagerService
+{
+    /**
+     * 查询负责人积分排名
+     *
+     * @param id 负责人积分排名主键
+     * @return 负责人积分排名
+     */
+    public PdmScoreRankManager selectPdmScoreRankManagerById(Long id);
+
+    /**
+     * 查询负责人积分排名列表
+     *
+     * @param pdmScoreRankManager 负责人积分排名
+     * @return 负责人积分排名集合
+     */
+    public List<PdmScoreRankManager> selectPdmScoreRankManagerList(PdmScoreRankManager pdmScoreRankManager);
+
+    /**
+     * 新增负责人积分排名
+     *
+     * @param pdmScoreRankManager 负责人积分排名
+     * @return 结果
+     */
+    public int insertPdmScoreRankManager(PdmScoreRankManager pdmScoreRankManager);
+
+    /**
+     * 修改负责人积分排名
+     *
+     * @param pdmScoreRankManager 负责人积分排名
+     * @return 结果
+     */
+    public int updatePdmScoreRankManager(PdmScoreRankManager pdmScoreRankManager);
+
+    /**
+     * 批量删除负责人积分排名
+     *
+     * @param ids 需要删除的负责人积分排名主键集合
+     * @return 结果
+     */
+    public int deletePdmScoreRankManagerByIds(Long[] ids);
+
+    /**
+     * 删除负责人积分排名信息
+     *
+     * @param id 负责人积分排名主键
+     * @return 结果
+     */
+    public int deletePdmScoreRankManagerById(Long id);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.powerdistribution.service;
+
+import java.util.List;
+import com.ruoyi.powerdistribution.domain.PdmScoreRankTeam;
+
+/**
+ * 队伍积分排名Service接口
+ *
+ * @author ruoyi
+ * @date 2024-12-05
+ */
+public interface IPdmScoreRankTeamService
+{
+    /**
+     * 查询队伍积分排名
+     *
+     * @param id 队伍积分排名主键
+     * @return 队伍积分排名
+     */
+    public PdmScoreRankTeam selectPdmScoreRankTeamById(Long id);
+
+    /**
+     * 查询队伍积分排名列表
+     *
+     * @param pdmScoreRankTeam 队伍积分排名
+     * @return 队伍积分排名集合
+     */
+    public List<PdmScoreRankTeam> selectPdmScoreRankTeamList(PdmScoreRankTeam pdmScoreRankTeam);
+
+    /**
+     * 新增队伍积分排名
+     *
+     * @param pdmScoreRankTeam 队伍积分排名
+     * @return 结果
+     */
+    public int insertPdmScoreRankTeam(PdmScoreRankTeam pdmScoreRankTeam);
+
+    /**
+     * 修改队伍积分排名
+     *
+     * @param pdmScoreRankTeam 队伍积分排名
+     * @return 结果
+     */
+    public int updatePdmScoreRankTeam(PdmScoreRankTeam pdmScoreRankTeam);
+
+    /**
+     * 批量删除队伍积分排名
+     *
+     * @param ids 需要删除的队伍积分排名主键集合
+     * @return 结果
+     */
+    public int deletePdmScoreRankTeamByIds(Long[] ids);
+
+    /**
+     * 删除队伍积分排名信息
+     *
+     * @param id 队伍积分排名主键
+     * @return 结果
+     */
+    public int deletePdmScoreRankTeamById(Long id);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.powerdistribution.service;
+
+import java.util.List;
+import com.ruoyi.powerdistribution.domain.PdmScoreRankWorker;
+
+/**
+ * 作业人员积分排名Service接口
+ *
+ * @author ruoyi
+ * @date 2024-12-05
+ */
+public interface IPdmScoreRankWorkerService
+{
+    /**
+     * 查询作业人员积分排名
+     *
+     * @param id 作业人员积分排名主键
+     * @return 作业人员积分排名
+     */
+    public PdmScoreRankWorker selectPdmScoreRankWorkerById(Long id);
+
+    /**
+     * 查询作业人员积分排名列表
+     *
+     * @param pdmScoreRankWorker 作业人员积分排名
+     * @return 作业人员积分排名集合
+     */
+    public List<PdmScoreRankWorker> selectPdmScoreRankWorkerList(PdmScoreRankWorker pdmScoreRankWorker);
+
+    /**
+     * 新增作业人员积分排名
+     *
+     * @param pdmScoreRankWorker 作业人员积分排名
+     * @return 结果
+     */
+    public int insertPdmScoreRankWorker(PdmScoreRankWorker pdmScoreRankWorker);
+
+    /**
+     * 修改作业人员积分排名
+     *
+     * @param pdmScoreRankWorker 作业人员积分排名
+     * @return 结果
+     */
+    public int updatePdmScoreRankWorker(PdmScoreRankWorker pdmScoreRankWorker);
+
+    /**
+     * 批量删除作业人员积分排名
+     *
+     * @param ids 需要删除的作业人员积分排名主键集合
+     * @return 结果
+     */
+    public int deletePdmScoreRankWorkerByIds(Long[] ids);
+
+    /**
+     * 删除作业人员积分排名信息
+     *
+     * @param id 作业人员积分排名主键
+     * @return 结果
+     */
+    public int deletePdmScoreRankWorkerById(Long id);
+}

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

@@ -0,0 +1,96 @@
+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.PdmScoreRankManagerMapper;
+import com.ruoyi.powerdistribution.domain.PdmScoreRankManager;
+import com.ruoyi.powerdistribution.service.IPdmScoreRankManagerService;
+
+/**
+ * 负责人积分排名Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-12-05
+ */
+@Service
+public class PdmScoreRankManagerServiceImpl implements IPdmScoreRankManagerService
+{
+    @Autowired
+    private PdmScoreRankManagerMapper pdmScoreRankManagerMapper;
+
+    /**
+     * 查询负责人积分排名
+     *
+     * @param id 负责人积分排名主键
+     * @return 负责人积分排名
+     */
+    @Override
+    public PdmScoreRankManager selectPdmScoreRankManagerById(Long id)
+    {
+        return pdmScoreRankManagerMapper.selectPdmScoreRankManagerById(id);
+    }
+
+    /**
+     * 查询负责人积分排名列表
+     *
+     * @param pdmScoreRankManager 负责人积分排名
+     * @return 负责人积分排名
+     */
+    @Override
+    public List<PdmScoreRankManager> selectPdmScoreRankManagerList(PdmScoreRankManager pdmScoreRankManager)
+    {
+        return pdmScoreRankManagerMapper.selectPdmScoreRankManagerList(pdmScoreRankManager);
+    }
+
+    /**
+     * 新增负责人积分排名
+     *
+     * @param pdmScoreRankManager 负责人积分排名
+     * @return 结果
+     */
+    @Override
+    public int insertPdmScoreRankManager(PdmScoreRankManager pdmScoreRankManager)
+    {
+        pdmScoreRankManager.setCreateTime(DateUtils.getNowDate());
+        return pdmScoreRankManagerMapper.insertPdmScoreRankManager(pdmScoreRankManager);
+    }
+
+    /**
+     * 修改负责人积分排名
+     *
+     * @param pdmScoreRankManager 负责人积分排名
+     * @return 结果
+     */
+    @Override
+    public int updatePdmScoreRankManager(PdmScoreRankManager pdmScoreRankManager)
+    {
+        pdmScoreRankManager.setUpdateTime(DateUtils.getNowDate());
+        return pdmScoreRankManagerMapper.updatePdmScoreRankManager(pdmScoreRankManager);
+    }
+
+    /**
+     * 批量删除负责人积分排名
+     *
+     * @param ids 需要删除的负责人积分排名主键
+     * @return 结果
+     */
+    @Override
+    public int deletePdmScoreRankManagerByIds(Long[] ids)
+    {
+        return pdmScoreRankManagerMapper.deletePdmScoreRankManagerByIds(ids);
+    }
+
+    /**
+     * 删除负责人积分排名信息
+     *
+     * @param id 负责人积分排名主键
+     * @return 结果
+     */
+    @Override
+    public int deletePdmScoreRankManagerById(Long id)
+    {
+        return pdmScoreRankManagerMapper.deletePdmScoreRankManagerById(id);
+    }
+}

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

@@ -0,0 +1,96 @@
+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.PdmScoreRankTeamMapper;
+import com.ruoyi.powerdistribution.domain.PdmScoreRankTeam;
+import com.ruoyi.powerdistribution.service.IPdmScoreRankTeamService;
+
+/**
+ * 队伍积分排名Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-12-05
+ */
+@Service
+public class PdmScoreRankTeamServiceImpl implements IPdmScoreRankTeamService
+{
+    @Autowired
+    private PdmScoreRankTeamMapper pdmScoreRankTeamMapper;
+
+    /**
+     * 查询队伍积分排名
+     *
+     * @param id 队伍积分排名主键
+     * @return 队伍积分排名
+     */
+    @Override
+    public PdmScoreRankTeam selectPdmScoreRankTeamById(Long id)
+    {
+        return pdmScoreRankTeamMapper.selectPdmScoreRankTeamById(id);
+    }
+
+    /**
+     * 查询队伍积分排名列表
+     *
+     * @param pdmScoreRankTeam 队伍积分排名
+     * @return 队伍积分排名
+     */
+    @Override
+    public List<PdmScoreRankTeam> selectPdmScoreRankTeamList(PdmScoreRankTeam pdmScoreRankTeam)
+    {
+        return pdmScoreRankTeamMapper.selectPdmScoreRankTeamList(pdmScoreRankTeam);
+    }
+
+    /**
+     * 新增队伍积分排名
+     *
+     * @param pdmScoreRankTeam 队伍积分排名
+     * @return 结果
+     */
+    @Override
+    public int insertPdmScoreRankTeam(PdmScoreRankTeam pdmScoreRankTeam)
+    {
+        pdmScoreRankTeam.setCreateTime(DateUtils.getNowDate());
+        return pdmScoreRankTeamMapper.insertPdmScoreRankTeam(pdmScoreRankTeam);
+    }
+
+    /**
+     * 修改队伍积分排名
+     *
+     * @param pdmScoreRankTeam 队伍积分排名
+     * @return 结果
+     */
+    @Override
+    public int updatePdmScoreRankTeam(PdmScoreRankTeam pdmScoreRankTeam)
+    {
+        pdmScoreRankTeam.setUpdateTime(DateUtils.getNowDate());
+        return pdmScoreRankTeamMapper.updatePdmScoreRankTeam(pdmScoreRankTeam);
+    }
+
+    /**
+     * 批量删除队伍积分排名
+     *
+     * @param ids 需要删除的队伍积分排名主键
+     * @return 结果
+     */
+    @Override
+    public int deletePdmScoreRankTeamByIds(Long[] ids)
+    {
+        return pdmScoreRankTeamMapper.deletePdmScoreRankTeamByIds(ids);
+    }
+
+    /**
+     * 删除队伍积分排名信息
+     *
+     * @param id 队伍积分排名主键
+     * @return 结果
+     */
+    @Override
+    public int deletePdmScoreRankTeamById(Long id)
+    {
+        return pdmScoreRankTeamMapper.deletePdmScoreRankTeamById(id);
+    }
+}

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

@@ -0,0 +1,96 @@
+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.PdmScoreRankWorkerMapper;
+import com.ruoyi.powerdistribution.domain.PdmScoreRankWorker;
+import com.ruoyi.powerdistribution.service.IPdmScoreRankWorkerService;
+
+/**
+ * 作业人员积分排名Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-12-05
+ */
+@Service
+public class PdmScoreRankWorkerServiceImpl implements IPdmScoreRankWorkerService
+{
+    @Autowired
+    private PdmScoreRankWorkerMapper pdmScoreRankWorkerMapper;
+
+    /**
+     * 查询作业人员积分排名
+     *
+     * @param id 作业人员积分排名主键
+     * @return 作业人员积分排名
+     */
+    @Override
+    public PdmScoreRankWorker selectPdmScoreRankWorkerById(Long id)
+    {
+        return pdmScoreRankWorkerMapper.selectPdmScoreRankWorkerById(id);
+    }
+
+    /**
+     * 查询作业人员积分排名列表
+     *
+     * @param pdmScoreRankWorker 作业人员积分排名
+     * @return 作业人员积分排名
+     */
+    @Override
+    public List<PdmScoreRankWorker> selectPdmScoreRankWorkerList(PdmScoreRankWorker pdmScoreRankWorker)
+    {
+        return pdmScoreRankWorkerMapper.selectPdmScoreRankWorkerList(pdmScoreRankWorker);
+    }
+
+    /**
+     * 新增作业人员积分排名
+     *
+     * @param pdmScoreRankWorker 作业人员积分排名
+     * @return 结果
+     */
+    @Override
+    public int insertPdmScoreRankWorker(PdmScoreRankWorker pdmScoreRankWorker)
+    {
+        pdmScoreRankWorker.setCreateTime(DateUtils.getNowDate());
+        return pdmScoreRankWorkerMapper.insertPdmScoreRankWorker(pdmScoreRankWorker);
+    }
+
+    /**
+     * 修改作业人员积分排名
+     *
+     * @param pdmScoreRankWorker 作业人员积分排名
+     * @return 结果
+     */
+    @Override
+    public int updatePdmScoreRankWorker(PdmScoreRankWorker pdmScoreRankWorker)
+    {
+        pdmScoreRankWorker.setUpdateTime(DateUtils.getNowDate());
+        return pdmScoreRankWorkerMapper.updatePdmScoreRankWorker(pdmScoreRankWorker);
+    }
+
+    /**
+     * 批量删除作业人员积分排名
+     *
+     * @param ids 需要删除的作业人员积分排名主键
+     * @return 结果
+     */
+    @Override
+    public int deletePdmScoreRankWorkerByIds(Long[] ids)
+    {
+        return pdmScoreRankWorkerMapper.deletePdmScoreRankWorkerByIds(ids);
+    }
+
+    /**
+     * 删除作业人员积分排名信息
+     *
+     * @param id 作业人员积分排名主键
+     * @return 结果
+     */
+    @Override
+    public int deletePdmScoreRankWorkerById(Long id)
+    {
+        return pdmScoreRankWorkerMapper.deletePdmScoreRankWorkerById(id);
+    }
+}

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

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectPdmReportAppointmentDayList" parameterType="PdmReportAppointmentDay" resultMap="PdmReportAppointmentDayResult">
+        select * from (
         <include refid="selectPdmReportAppointmentDayVo"/>
         <where>
             <if test="company != null  and company != ''"> and company = #{company}</if>
@@ -36,6 +37,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="absentBadSum != null "> and absent_bad_sum = #{absentBadSum}</if>
             <if test="absentBadDetail != null  and absentBadDetail != ''"> and absent_bad_detail = #{absentBadDetail}</if>
         </where>
+        UNION
+        SELECT
+        sum(id) as id,
+        '总计' as company,
+        report_date,
+        sum(ifnull(boss_sum,0)) boss_sum,
+        sum(ifnull(manage_sum,0)) manage_sum,
+        sum(ifnull(absent_sum,0)) absent_sum,
+        null absent_detail,
+        sum(ifnull(absent_bad_sum,0)) absent_bad_sum,
+        null absent_bad_detail,
+        null create_by ,
+        null create_time,
+        null update_by,
+        null update_time FROM
+        pdm_report_appointment_day
+        <where>
+            <if test="company != null  and company != ''"> and company = #{company}</if>
+            <if test="reportDate != null  and reportDate != ''"> and report_date = #{reportDate}</if>
+            <if test="bossSum != null "> and boss_sum = #{bossSum}</if>
+            <if test="manageSum != null "> and manage_sum = #{manageSum}</if>
+            <if test="absentSum != null "> and absent_sum = #{absentSum}</if>
+            <if test="absentDetail != null  and absentDetail != ''"> and absent_detail = #{absentDetail}</if>
+            <if test="absentBadSum != null "> and absent_bad_sum = #{absentBadSum}</if>
+            <if test="absentBadDetail != null  and absentBadDetail != ''"> and absent_bad_detail = #{absentBadDetail}</if>
+        </where>
+        GROUP BY report_date) a order by id asc
     </select>
 
     <select id="selectPdmReportAppointmentDayById" parameterType="Long" resultMap="PdmReportAppointmentDayResult">

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

@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectPdmReportAppointmentWeekList" parameterType="PdmReportAppointmentWeek" resultMap="PdmReportAppointmentWeekResult">
+        select * from (
         <include refid="selectPdmReportAppointmentWeekVo"/>
         <where>
             <if test="company != null  and company != ''"> and company = #{company}</if>
@@ -42,6 +43,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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">

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

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectPdmReportIllegalWeekList" parameterType="PdmReportIllegalWeek" resultMap="PdmReportIllegalWeekResult">
+        select * from (
         <include refid="selectPdmReportIllegalWeekVo"/>
         <where>
             <if test="company != null  and company != ''"> and company = #{company}</if>
@@ -38,6 +39,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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">

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

@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectPdmReportPlanDayList" parameterType="PdmReportPlanDay" resultMap="PdmReportPlanDayResult">
+        select * from (
         <include refid="selectPdmReportPlanDayVo"/>
         <where>
             <if test="company != null  and company != ''"> and company = #{company}</if>
@@ -40,6 +41,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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,
+        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,
+        null temporary_plan_ratio,
+        null create_by ,
+        null create_time,
+        null update_by,
+        null update_time FROM
+        pdm_report_plan_day
+        <where>
+            <if test="company != null  and company != ''"> and company = #{company}</if>
+            <if test="reportDate != null  and reportDate != ''"> and report_date = #{reportDate}</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="selectPdmReportPlanDayById" parameterType="Long" resultMap="PdmReportPlanDayResult">

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

@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectPdmReportPlanNextDayList" parameterType="PdmReportPlanNextDay" resultMap="PdmReportPlanNextDayResult">
+        select * from (
         <include refid="selectPdmReportPlanNextDayVo"/>
         <where>
             <if test="company != null  and company != ''"> and company = #{company}</if>
@@ -48,6 +49,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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,
+        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(temporary_plan_sum,0)) temporary_plan_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_day
+        <where>
+            <if test="company != null  and company != ''"> and company = #{company}</if>
+            <if test="reportDate != null  and reportDate != ''"> and report_date = #{reportDate}</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="temporaryPlanSum != null "> and temporary_plan_sum = #{temporaryPlanSum}</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="selectPdmReportPlanNextDayById" parameterType="Long" resultMap="PdmReportPlanNextDayResult">

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

@@ -31,7 +31,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectPdmReportPlanNextWeekList" parameterType="PdmReportPlanNextWeek" resultMap="PdmReportPlanNextWeekResult">
-        <include refid="selectPdmReportPlanNextWeekVo"/>
+        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>
@@ -48,6 +87,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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">

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

@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectPdmReportPlanWeekList" parameterType="PdmReportPlanWeek" resultMap="PdmReportPlanWeekResult">
+        select * from (
         <include refid="selectPdmReportPlanWeekVo"/>
         <where>
             <if test="company != null  and company != ''"> and company = #{company}</if>
@@ -42,6 +43,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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,
+        null 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">

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

@@ -0,0 +1,103 @@
+<?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.PdmScoreRankManagerMapper">
+
+    <resultMap type="PdmScoreRankManager" id="PdmScoreRankManagerResult">
+        <result property="id"    column="id"    />
+        <result property="reportYear"    column="report_year"    />
+        <result property="reportDate"    column="report_date"    />
+        <result property="companyNo"    column="company_no"    />
+        <result property="companyName"    column="company_name"    />
+        <result property="managerId"    column="manager_id"    />
+        <result property="managerName"    column="manager_name"    />
+        <result property="score"    column="score"    />
+        <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="selectPdmScoreRankManagerVo">
+        select id, report_year, report_date, company_no, company_name, manager_id, manager_name, score, create_by, create_time, update_by, update_time from pdm_score_rank_manager
+    </sql>
+
+    <select id="selectPdmScoreRankManagerList" parameterType="PdmScoreRankManager" resultMap="PdmScoreRankManagerResult">
+        <include refid="selectPdmScoreRankManagerVo"/>
+        <where>
+            <if test="reportYear != null  and reportYear != ''"> and report_year = #{reportYear}</if>
+            <if test="reportDate != null  and reportDate != ''"> and report_date = #{reportDate}</if>
+            <if test="companyNo != null  and companyNo != ''"> and company_no = #{companyNo}</if>
+            <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
+            <if test="managerId != null  and managerId != ''"> and manager_id = #{managerId}</if>
+            <if test="managerName != null  and managerName != ''"> and manager_name like concat('%', #{managerName}, '%')</if>
+            <if test="score != null "> and score = #{score}</if>
+        </where>
+        order by score desc
+    </select>
+
+    <select id="selectPdmScoreRankManagerById" parameterType="Long" resultMap="PdmScoreRankManagerResult">
+        <include refid="selectPdmScoreRankManagerVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertPdmScoreRankManager" parameterType="PdmScoreRankManager" useGeneratedKeys="true" keyProperty="id">
+        insert into pdm_score_rank_manager
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="reportYear != null">report_year,</if>
+            <if test="reportDate != null">report_date,</if>
+            <if test="companyNo != null">company_no,</if>
+            <if test="companyName != null">company_name,</if>
+            <if test="managerId != null">manager_id,</if>
+            <if test="managerName != null">manager_name,</if>
+            <if test="score != null">score,</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="reportYear != null">#{reportYear},</if>
+            <if test="reportDate != null">#{reportDate},</if>
+            <if test="companyNo != null">#{companyNo},</if>
+            <if test="companyName != null">#{companyName},</if>
+            <if test="managerId != null">#{managerId},</if>
+            <if test="managerName != null">#{managerName},</if>
+            <if test="score != null">#{score},</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="updatePdmScoreRankManager" parameterType="PdmScoreRankManager">
+        update pdm_score_rank_manager
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="reportYear != null">report_year = #{reportYear},</if>
+            <if test="reportDate != null">report_date = #{reportDate},</if>
+            <if test="companyNo != null">company_no = #{companyNo},</if>
+            <if test="companyName != null">company_name = #{companyName},</if>
+            <if test="managerId != null">manager_id = #{managerId},</if>
+            <if test="managerName != null">manager_name = #{managerName},</if>
+            <if test="score != null">score = #{score},</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="deletePdmScoreRankManagerById" parameterType="Long">
+        delete from pdm_score_rank_manager where id = #{id}
+    </delete>
+
+    <delete id="deletePdmScoreRankManagerByIds" parameterType="String">
+        delete from pdm_score_rank_manager where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,103 @@
+<?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.PdmScoreRankTeamMapper">
+
+    <resultMap type="PdmScoreRankTeam" id="PdmScoreRankTeamResult">
+        <result property="id"    column="id"    />
+        <result property="reportYear"    column="report_year"    />
+        <result property="reportDate"    column="report_date"    />
+        <result property="companyNo"    column="company_no"    />
+        <result property="companyName"    column="company_name"    />
+        <result property="teamId"    column="team_id"    />
+        <result property="teamName"    column="team_name"    />
+        <result property="score"    column="score"    />
+        <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="selectPdmScoreRankTeamVo">
+        select id, report_year, report_date, company_no, company_name, team_id, team_name, score, create_by, create_time, update_by, update_time from pdm_score_rank_team
+    </sql>
+
+    <select id="selectPdmScoreRankTeamList" parameterType="PdmScoreRankTeam" resultMap="PdmScoreRankTeamResult">
+        <include refid="selectPdmScoreRankTeamVo"/>
+        <where>
+            <if test="reportYear != null  and reportYear != ''"> and report_year = #{reportYear}</if>
+            <if test="reportDate != null  and reportDate != ''"> and report_date = #{reportDate}</if>
+            <if test="companyNo != null  and companyNo != ''"> and company_no = #{companyNo}</if>
+            <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
+            <if test="teamId != null  and teamId != ''"> and team_id = #{teamId}</if>
+            <if test="teamName != null  and teamName != ''"> and team_name like concat('%', #{teamName}, '%')</if>
+            <if test="score != null "> and score = #{score}</if>
+        </where>
+        order by score desc
+    </select>
+
+    <select id="selectPdmScoreRankTeamById" parameterType="Long" resultMap="PdmScoreRankTeamResult">
+        <include refid="selectPdmScoreRankTeamVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertPdmScoreRankTeam" parameterType="PdmScoreRankTeam" useGeneratedKeys="true" keyProperty="id">
+        insert into pdm_score_rank_team
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="reportYear != null">report_year,</if>
+            <if test="reportDate != null">report_date,</if>
+            <if test="companyNo != null">company_no,</if>
+            <if test="companyName != null">company_name,</if>
+            <if test="teamId != null">team_id,</if>
+            <if test="teamName != null">team_name,</if>
+            <if test="score != null">score,</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="reportYear != null">#{reportYear},</if>
+            <if test="reportDate != null">#{reportDate},</if>
+            <if test="companyNo != null">#{companyNo},</if>
+            <if test="companyName != null">#{companyName},</if>
+            <if test="teamId != null">#{teamId},</if>
+            <if test="teamName != null">#{teamName},</if>
+            <if test="score != null">#{score},</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="updatePdmScoreRankTeam" parameterType="PdmScoreRankTeam">
+        update pdm_score_rank_team
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="reportYear != null">report_year = #{reportYear},</if>
+            <if test="reportDate != null">report_date = #{reportDate},</if>
+            <if test="companyNo != null">company_no = #{companyNo},</if>
+            <if test="companyName != null">company_name = #{companyName},</if>
+            <if test="teamId != null">team_id = #{teamId},</if>
+            <if test="teamName != null">team_name = #{teamName},</if>
+            <if test="score != null">score = #{score},</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="deletePdmScoreRankTeamById" parameterType="Long">
+        delete from pdm_score_rank_team where id = #{id}
+    </delete>
+
+    <delete id="deletePdmScoreRankTeamByIds" parameterType="String">
+        delete from pdm_score_rank_team where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,103 @@
+<?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.PdmScoreRankWorkerMapper">
+
+    <resultMap type="PdmScoreRankWorker" id="PdmScoreRankWorkerResult">
+        <result property="id"    column="id"    />
+        <result property="reportYear"    column="report_year"    />
+        <result property="reportDate"    column="report_date"    />
+        <result property="companyNo"    column="company_no"    />
+        <result property="companyName"    column="company_name"    />
+        <result property="workUserId"    column="work_user_id"    />
+        <result property="workUserName"    column="work_user_name"    />
+        <result property="score"    column="score"    />
+        <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="selectPdmScoreRankWorkerVo">
+        select id, report_year, report_date, company_no, company_name, work_user_id, work_user_name, score, create_by, create_time, update_by, update_time from pdm_score_rank_worker
+    </sql>
+
+    <select id="selectPdmScoreRankWorkerList" parameterType="PdmScoreRankWorker" resultMap="PdmScoreRankWorkerResult">
+        <include refid="selectPdmScoreRankWorkerVo"/>
+        <where>
+            <if test="reportYear != null  and reportYear != ''"> and report_year = #{reportYear}</if>
+            <if test="reportDate != null  and reportDate != ''"> and report_date = #{reportDate}</if>
+            <if test="companyNo != null  and companyNo != ''"> and company_no = #{companyNo}</if>
+            <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
+            <if test="workUserId != null  and workUserId != ''"> and work_user_id = #{workUserId}</if>
+            <if test="workUserName != null  and workUserName != ''"> and work_user_name like concat('%', #{workUserName}, '%')</if>
+            <if test="score != null "> and score = #{score}</if>
+        </where>
+        order by score desc
+    </select>
+
+    <select id="selectPdmScoreRankWorkerById" parameterType="Long" resultMap="PdmScoreRankWorkerResult">
+        <include refid="selectPdmScoreRankWorkerVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertPdmScoreRankWorker" parameterType="PdmScoreRankWorker" useGeneratedKeys="true" keyProperty="id">
+        insert into pdm_score_rank_worker
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="reportYear != null">report_year,</if>
+            <if test="reportDate != null">report_date,</if>
+            <if test="companyNo != null">company_no,</if>
+            <if test="companyName != null">company_name,</if>
+            <if test="workUserId != null">work_user_id,</if>
+            <if test="workUserName != null">work_user_name,</if>
+            <if test="score != null">score,</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="reportYear != null">#{reportYear},</if>
+            <if test="reportDate != null">#{reportDate},</if>
+            <if test="companyNo != null">#{companyNo},</if>
+            <if test="companyName != null">#{companyName},</if>
+            <if test="workUserId != null">#{workUserId},</if>
+            <if test="workUserName != null">#{workUserName},</if>
+            <if test="score != null">#{score},</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="updatePdmScoreRankWorker" parameterType="PdmScoreRankWorker">
+        update pdm_score_rank_worker
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="reportYear != null">report_year = #{reportYear},</if>
+            <if test="reportDate != null">report_date = #{reportDate},</if>
+            <if test="companyNo != null">company_no = #{companyNo},</if>
+            <if test="companyName != null">company_name = #{companyName},</if>
+            <if test="workUserId != null">work_user_id = #{workUserId},</if>
+            <if test="workUserName != null">work_user_name = #{workUserName},</if>
+            <if test="score != null">score = #{score},</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="deletePdmScoreRankWorkerById" parameterType="Long">
+        delete from pdm_score_rank_worker where id = #{id}
+    </delete>
+
+    <delete id="deletePdmScoreRankWorkerByIds" parameterType="String">
+        delete from pdm_score_rank_worker where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -219,14 +219,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endDate != null and endDate != ''">
                 and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
             </if>
-            <if test="level3Flag != null and level3Flag == '1'">
+            <if test="level3Flag != null and level3Flag == 1 ">
                 and op_risk_lvl_cd in ('2007001','2007002','2007003')
             </if>
-            <if test="dataFlag != null and dataFlag == '1'">
+            <if test="dataFlag != null and dataFlag == 1 ">
                 and volt_lvl_cd not in ('2001008','2001009')
                 and not  (is_energized_op_cd = '2006001' and poweroff_typ_cd = '2005002' and workticket_typ_cd = '2008015')
             </if>
-            <if test="riskFlag != null and riskFlag == '1'">
+            <if test="riskFlag != null and riskFlag == 1 ">
                 and risk_type != '0'
             </if>
         </where>