瀏覽代碼

积分统计(负责人 队伍) 定时器代码提交

zx 5 月之前
父節點
當前提交
3783ec66c1
共有 16 個文件被更改,包括 207 次插入258 次删除
  1. 28 1
      ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
  2. 11 87
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/PdmScoreRankManager.java
  3. 11 76
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/PdmScoreRankTeam.java
  4. 11 86
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/PdmScoreRankWorker.java
  5. 10 1
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/mapper/PdmScoreRankManagerMapper.java
  6. 11 1
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/mapper/PdmScoreRankTeamMapper.java
  7. 4 1
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/mapper/PdmScoreRankWorkerMapper.java
  8. 8 0
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/IPdmScoreRankManagerService.java
  9. 9 0
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/IPdmScoreRankTeamService.java
  10. 23 1
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/impl/PdmScoreRankManagerServiceImpl.java
  11. 23 1
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/impl/PdmScoreRankTeamServiceImpl.java
  12. 5 0
      ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/impl/PdmWorkPlanServiceImpl.java
  13. 13 0
      ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmScoreRankManagerMapper.xml
  14. 13 0
      ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmScoreRankTeamMapper.xml
  15. 6 3
      ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmWorkPlanMapper.xml
  16. 21 0
      ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

+ 28 - 1
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -237,8 +237,35 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         return nextDay.format(formatter);
     }
 
+    /**
+     * 获取上个月的第一天
+     * @param format
+     * @return
+     */
+    public static String getFirstDateLastMonthStr(String format){
+        LocalDate now = LocalDate.now();
+        LocalDate firstDayOfLastMonth = now.with(TemporalAdjusters.firstDayOfMonth()).minusMonths(1);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format);
+        return firstDayOfLastMonth.format(formatter);
+    }
+
+    /**
+     * 获取上个月的最后一天
+     * @param format
+     * @return
+     */
+    public static String getLastDateLastMonthStr(String format){
+        LocalDate now = LocalDate.now();
+        LocalDate previousMonth = now.minusMonths(1);
+        int lastDayOfPreviousMonth = previousMonth.lengthOfMonth();
+        LocalDate lastDateOfPreviousMonth = LocalDate.of(previousMonth.getYear(), previousMonth.getMonth(), lastDayOfPreviousMonth);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format);
+        return lastDateOfPreviousMonth.format(formatter);
+    }
+
     public static void main(String[] args) {
-        System.out.println(getNextMonday("20241125",YYYYMMDD));
+        //System.out.println(getNextMonday("20241125",YYYYMMDD));
+        //System.out.println(getLastDateLastMonthStr("yyyyMMdd"));
     }
 
 }

+ 11 - 87
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/PdmScoreRankManager.java

@@ -1,6 +1,8 @@
 package com.ruoyi.powerdistribution.domain;
 
 import java.math.BigDecimal;
+
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -12,6 +14,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2024-12-05
  */
+@Data
 public class PdmScoreRankManager extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -55,94 +58,15 @@ public class PdmScoreRankManager extends BaseEntity
     @Excel(name = "是否黑榜")
     private String isBlack;
 
-    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;
-    }
-
-    public String getIsBlack() {
-        return isBlack;
-    }
+    /**
+     * 查询-开始时间
+     */
+    private String startDate;
 
-    public void setIsBlack(String isBlack) {
-        this.isBlack = isBlack;
-    }
+    /**
+     * 查询-结束时间
+     */
+    private String endDate;
 
     @Override
     public String toString() {

+ 11 - 76
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/PdmScoreRankTeam.java

@@ -1,6 +1,8 @@
 package com.ruoyi.powerdistribution.domain;
 
 import java.math.BigDecimal;
+
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -12,6 +14,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2024-12-09
  */
+@Data
 public class PdmScoreRankTeam extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -51,84 +54,16 @@ public class PdmScoreRankTeam extends BaseEntity
     @Excel(name = "是否黑榜")
     private String isBlack;
 
-    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 setTeamType(String teamType)
-    {
-        this.teamType = teamType;
-    }
+    /**
+     * 查询-开始时间
+     */
+    private String startDate;
 
-    public String getTeamType()
-    {
-        return teamType;
-    }
-    public void setTeamId(String teamId)
-    {
-        this.teamId = teamId;
-    }
+    /**
+     * 查询-结束时间
+     */
+    private String endDate;
 
-    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;
-    }
-
-    public String getIsBlack() {
-        return isBlack;
-    }
-
-    public void setIsBlack(String isBlack) {
-        this.isBlack = isBlack;
-    }
 
     @Override
     public String toString() {

+ 11 - 86
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/PdmScoreRankWorker.java

@@ -1,6 +1,8 @@
 package com.ruoyi.powerdistribution.domain;
 
 import java.math.BigDecimal;
+
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -12,6 +14,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2024-12-05
  */
+@Data
 public class PdmScoreRankWorker extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -55,94 +58,16 @@ public class PdmScoreRankWorker extends BaseEntity
     @Excel(name = "是否黑榜")
     private String isBlack;
 
-    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;
-    }
+    /**
+     * 查询-开始时间
+     */
+    private String startDate;
 
-    public String getCompanyName()
-    {
-        return companyName;
-    }
-    public void setWorkUserId(String workUserId)
-    {
-        this.workUserId = workUserId;
-    }
+    /**
+     * 查询-结束时间
+     */
+    private String endDate;
 
-    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;
-    }
-
-    public String getIsBlack() {
-        return isBlack;
-    }
-
-    public void setIsBlack(String isBlack) {
-        this.isBlack = isBlack;
-    }
 
     @Override
     public String toString() {

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

@@ -1,6 +1,8 @@
 package com.ruoyi.powerdistribution.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.powerdistribution.domain.PdmScoreRankManager;
 
 /**
@@ -9,7 +11,7 @@ import com.ruoyi.powerdistribution.domain.PdmScoreRankManager;
  * @author ruoyi
  * @date 2024-12-05
  */
-public interface PdmScoreRankManagerMapper
+public interface PdmScoreRankManagerMapper extends BaseMapper<PdmScoreRankManager>
 {
     /**
      * 查询负责人积分排名
@@ -58,4 +60,11 @@ public interface PdmScoreRankManagerMapper
      * @return 结果
      */
     public int deletePdmScoreRankManagerByIds(Long[] ids);
+
+    /**
+     * 统计并保存负责人得分
+     * @param pdmScoreRankManager
+     * @return
+     */
+    int saveRank(PdmScoreRankManager pdmScoreRankManager);
 }

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

@@ -1,6 +1,9 @@
 package com.ruoyi.powerdistribution.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.powerdistribution.domain.PdmScoreRankManager;
 import com.ruoyi.powerdistribution.domain.PdmScoreRankTeam;
 
 /**
@@ -9,7 +12,7 @@ import com.ruoyi.powerdistribution.domain.PdmScoreRankTeam;
  * @author ruoyi
  * @date 2024-12-09
  */
-public interface PdmScoreRankTeamMapper
+public interface PdmScoreRankTeamMapper extends BaseMapper<PdmScoreRankTeam>
 {
     /**
      * 查询队伍积分排名
@@ -58,4 +61,11 @@ public interface PdmScoreRankTeamMapper
      * @return 结果
      */
     public int deletePdmScoreRankTeamByIds(Long[] ids);
+
+    /**
+     * 统计并保存队伍得分
+     * @param pdmScoreRankTeam
+     * @return
+     */
+    int saveTeam(PdmScoreRankTeam pdmScoreRankTeam);
 }

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

@@ -1,6 +1,9 @@
 package com.ruoyi.powerdistribution.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.powerdistribution.domain.PdmScoreRankManager;
 import com.ruoyi.powerdistribution.domain.PdmScoreRankWorker;
 
 /**
@@ -9,7 +12,7 @@ import com.ruoyi.powerdistribution.domain.PdmScoreRankWorker;
  * @author ruoyi
  * @date 2024-12-05
  */
-public interface PdmScoreRankWorkerMapper
+public interface PdmScoreRankWorkerMapper extends BaseMapper<PdmScoreRankWorker>
 {
     /**
      * 查询作业人员积分排名

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

@@ -58,4 +58,12 @@ public interface IPdmScoreRankManagerService
      * @return 结果
      */
     public int deletePdmScoreRankManagerById(Long id);
+
+    /**
+     * 统计并保存负责人得分
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    int saveRank(String startDate,String endDate);
 }

+ 9 - 0
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/IPdmScoreRankTeamService.java

@@ -58,4 +58,13 @@ public interface IPdmScoreRankTeamService
      * @return 结果
      */
     public int deletePdmScoreRankTeamById(Long id);
+
+
+    /**
+     * 统计并保存队伍得分
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    int saveTeam(String startDate,String endDate);
 }

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

@@ -1,12 +1,19 @@
 package com.ruoyi.powerdistribution.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.powerdistribution.domain.PdmStopTarge;
+import com.ruoyi.powerdistribution.mapper.PdmStopTargeMapper;
+import org.apache.commons.lang3.StringUtils;
 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;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 负责人积分排名Service业务层处理
@@ -15,7 +22,7 @@ import com.ruoyi.powerdistribution.service.IPdmScoreRankManagerService;
  * @date 2024-12-05
  */
 @Service
-public class PdmScoreRankManagerServiceImpl implements IPdmScoreRankManagerService
+public class PdmScoreRankManagerServiceImpl extends ServiceImpl<PdmScoreRankManagerMapper, PdmScoreRankManager> implements IPdmScoreRankManagerService
 {
     @Autowired
     private PdmScoreRankManagerMapper pdmScoreRankManagerMapper;
@@ -93,4 +100,19 @@ public class PdmScoreRankManagerServiceImpl implements IPdmScoreRankManagerServi
     {
         return pdmScoreRankManagerMapper.deletePdmScoreRankManagerById(id);
     }
+
+    @Transactional
+    @Override
+    public int saveRank(String startDate,String endDate) {
+        if(StringUtils.isEmpty(startDate) || StringUtils.isEmpty(endDate)){
+            startDate = DateUtils.getFirstDateLastMonthStr(DateUtils.YYYYMMDD);
+            endDate = DateUtils.getLastDateLastMonthStr(DateUtils.YYYYMMDD);
+        }
+        String reportDate = startDate.substring(0,6);
+        this.remove(new LambdaUpdateWrapper<PdmScoreRankManager>().eq(PdmScoreRankManager::getReportDate,reportDate));
+        PdmScoreRankManager pdmScoreRankManager = new PdmScoreRankManager();
+        pdmScoreRankManager.setStartDate(startDate);
+        pdmScoreRankManager.setEndDate(endDate);
+        return pdmScoreRankManagerMapper.saveRank(pdmScoreRankManager);
+    }
 }

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

@@ -1,12 +1,19 @@
 package com.ruoyi.powerdistribution.service.impl;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.powerdistribution.domain.PdmScoreRankManager;
+import com.ruoyi.powerdistribution.mapper.PdmScoreRankManagerMapper;
+import org.apache.commons.lang3.StringUtils;
 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;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 队伍积分排名Service业务层处理
@@ -15,7 +22,7 @@ import com.ruoyi.powerdistribution.service.IPdmScoreRankTeamService;
  * @date 2024-12-05
  */
 @Service
-public class PdmScoreRankTeamServiceImpl implements IPdmScoreRankTeamService
+public class PdmScoreRankTeamServiceImpl extends ServiceImpl<PdmScoreRankTeamMapper, PdmScoreRankTeam> implements IPdmScoreRankTeamService
 {
     @Autowired
     private PdmScoreRankTeamMapper pdmScoreRankTeamMapper;
@@ -93,4 +100,19 @@ public class PdmScoreRankTeamServiceImpl implements IPdmScoreRankTeamService
     {
         return pdmScoreRankTeamMapper.deletePdmScoreRankTeamById(id);
     }
+
+    @Transactional
+    @Override
+    public int saveTeam(String startDate,String endDate) {
+        if(StringUtils.isEmpty(startDate) || StringUtils.isEmpty(endDate)){
+            startDate = DateUtils.getFirstDateLastMonthStr(DateUtils.YYYYMMDD);
+            endDate = DateUtils.getLastDateLastMonthStr(DateUtils.YYYYMMDD);
+        }
+        String reportDate = startDate.substring(0,6);
+        this.remove(new LambdaUpdateWrapper<PdmScoreRankTeam>().eq(PdmScoreRankTeam::getReportDate,reportDate));
+        PdmScoreRankTeam team = new PdmScoreRankTeam();
+        team.setStartDate(startDate);
+        team.setEndDate(endDate);
+        return pdmScoreRankTeamMapper.saveTeam(team);
+    }
 }

+ 5 - 0
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/impl/PdmWorkPlanServiceImpl.java

@@ -11,6 +11,7 @@ import com.ruoyi.powerdistribution.domain.vo.WorkNumByCompanyStatistics;
 import com.ruoyi.powerdistribution.domain.vo.WorkRiskStatistics;
 import com.ruoyi.powerdistribution.service.IPdmRiskRoleService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.powerdistribution.mapper.PdmWorkPlanMapper;
@@ -124,6 +125,10 @@ public class PdmWorkPlanServiceImpl implements IPdmWorkPlanService
         PdmWorkPlanDTO pdmWorkPlan = new PdmWorkPlanDTO();
         pdmWorkPlan.setRiskType("0");//未处理
         List<PdmWorkPlan> list = pdmWorkPlanMapper.selectPdmWorkPlanList(pdmWorkPlan);
+        if(CollectionUtils.isEmpty(list)){
+            log.info("没有作业数据需要处理");
+            return;
+        }
         List<PdmRiskRole> riskRoleList = riskRoleService.selectPdmRiskRoleList(new PdmRiskRole());
         for(PdmWorkPlan plan:list){
             String voltLvlCd =  plan.getVoltLvlCd();

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

@@ -105,4 +105,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <insert id="saveRank" parameterType="PdmScoreRankManager">
+        insert into pdm_score_rank_manager(report_year,report_date,company_name,manager_name,score)
+        select SUBSTRING(t2.data_dt,1,4) report_year, SUBSTRING(t2.data_dt,1,6) report_date,
+               op_org company_name,work_princip manager_name,count(1) score
+        from pdm_violation_records t1,pdm_inspection_records t2
+        where t1.audit_rec_id = t2.audit_rec_id
+        and  date_format(t2.op_plan_start_tm,'%Y%m%d') &gt;= #{startDate}
+        and  date_format(t2.op_plan_start_tm,'%Y%m%d') &lt;= #{endDate}
+        GROUP BY op_org,work_princip,work_princip_id
+
+    </insert>
+
 </mapper>

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

@@ -102,4 +102,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <insert id="saveTeam" parameterType="PdmScoreRankTeam">
+        insert into pdm_score_rank_team(report_year,report_date,team_type,team_name,score)
+        select SUBSTRING(t2.data_dt,1,4) report_year,SUBSTRING(t2.data_dt,1,6) report_date,
+        '1',op_team,count(1) score
+        from pdm_violation_records t1,pdm_inspection_records t2
+        where t1.audit_rec_id = t2.audit_rec_id
+          and  date_format(t2.op_plan_start_tm,'%Y%m%d') &gt;= #{startDate}
+          and  date_format(t2.op_plan_start_tm,'%Y%m%d') &lt;= #{endDate}
+        GROUP BY op_team
+
+    </insert>
+
 </mapper>

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

@@ -574,8 +574,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN
         (
           select count(1) risk_num,risk_type from pdm_work_plan
-          where risk_type !='0'
-          and data_dt  = #{date}
+          where risk_type not in ('0','1')
+          and date_format(plan_start_wk_tm,'%Y%m%d')  = #{date}
+          GROUP BY risk_type
          ) t2 on t1.role_code = t2.risk_type
     </select>
     <select id="getWorkNumByCompanyStatistics" parameterType="com.ruoyi.powerdistribution.domain.vo.WorkNumByCompanyStatistics" resultType="com.ruoyi.powerdistribution.domain.vo.WorkNumByCompanyStatistics">
@@ -584,7 +585,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN
         (
         SELECT count(1) work_num,submit_org_nm from pdm_work_plan
-        where data_dt  &gt;= #{startDate} and data_dt &lt;= #{endDate}
+        where
+            date_format(plan_start_wk_tm,'%Y%m%d') &gt;= #{startDate}
+            and date_format(plan_start_wk_tm,'%Y%m%d') &lt;= #{endDate}
         GROUP BY submit_org_nm
         ) t2 on t1.organ_name = t2.submit_org_nm
     </select>

+ 21 - 0
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -1,5 +1,7 @@
 package com.ruoyi.quartz.task;
 
+import com.ruoyi.powerdistribution.service.IPdmScoreRankManagerService;
+import com.ruoyi.powerdistribution.service.IPdmScoreRankTeamService;
 import com.ruoyi.powerdistribution.service.IPdmWorkPlanService;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.utils.StringUtils;
@@ -18,6 +20,11 @@ public class RyTask
     @Resource
     private IPdmWorkPlanService workPlanService;
 
+    @Resource
+    private IPdmScoreRankManagerService scoreRankManagerService;
+    @Resource
+    private IPdmScoreRankTeamService scoreRankTeamService;
+
     public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
     {
         System.out.println(StringUtils.format("执行多参方法: 字符串类型{},布尔类型{},长整型{},浮点型{},整形{}", s, b, l, d, i));
@@ -38,6 +45,20 @@ public class RyTask
      */
     public void workDataCompute(){
         workPlanService.workDataCompute();
+    }
 
+    /**
+     * 统计并保存负责人得分
+     */
+    public void saveRank(String startDate,String endDate){
+        scoreRankManagerService.saveRank(startDate,endDate);
     }
+
+    /**
+     * 统计并保存队伍得分
+     */
+    public void saveTeam(String startDate,String endDate){
+        scoreRankTeamService.saveTeam(startDate,endDate);
+    }
+
 }