修改积分统计计算日期

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

@@ -108,8 +108,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <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
+        select
+            DATE_FORMAT(t2.op_plan_start_tm,'%Y') report_year,
+            DATE_FORMAT(t2.op_plan_start_tm,'%Y%m') 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}

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

@@ -105,7 +105,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <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,
+        select  DATE_FORMAT(t2.op_plan_start_tm,'%Y') report_year,
+                DATE_FORMAT(t2.op_plan_start_tm,'%Y%m') report_date,
         if(t2.op_team like '%公司',2,1) team_type,op_team,count(1) score
         from pdm_violation_records t1,pdm_inspection_records t2
         where t1.audit_rec_id = t2.audit_rec_id

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

@@ -122,7 +122,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <insert id="saveWorker" parameterType="PdmScoreRankWorker">
         INSERT INTO pdm_score_rank_worker (report_year,report_date,company_name,work_user_id,work_user_name,score)
-        SELECT SUBSTRING(data_dt,1,4) report_year, SUBSTRING(data_dt,1,6) report_date,std_county_org_nm company_name,
+        SELECT  DATE_FORMAT(create_tm,'%Y') report_year,
+                DATE_FORMAT(create_tm,'%Y%m') report_date,
+               std_county_org_nm company_name,
                person_id,person_nm,count(1) score
         from pdm_work_plan_worker
         where  date_format(create_tm,'%Y%m%d') &gt;= #{startDate}