【CHG】修改查询条件

railway-business/src/main/java/com/railway/business/bi/domain/vo/YdtsTotalVO.java → railway-business/src/main/java/com/railway/business/bi/domain/vo/QuarterTotalVO.java

@@ -11,8 +11,8 @@ import lombok.Data;
  * @author ZhaoMn 2023-01-30
  */
 @Data
-@ApiModel("大屏展示-远动调试环图数据")
-public class YdtsTotalVO implements Serializable {
+@ApiModel("大屏展示-季度统计数据")
+public class QuarterTotalVO implements Serializable {
 
   @ApiModelProperty(value = "一季度计划")
   private int plan1;
@@ -38,7 +38,7 @@ public class YdtsTotalVO implements Serializable {
   @ApiModelProperty(value = "四季度完成")
   private int actual4;
 
-  public YdtsTotalVO() {
+  public QuarterTotalVO() {
   }
 
 }

railway-business/src/main/java/com/railway/business/bi/mapper/ShowGsdMapper.java

@@ -3,6 +3,7 @@ package com.railway.business.bi.mapper;
 import com.github.pagehelper.Page;
 import com.railway.business.bi.domain.ShowGsd;
 import com.railway.business.bi.domain.vo.GsdQuery;
+import com.railway.business.bi.domain.vo.QuarterTotalVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -42,4 +43,6 @@ public interface ShowGsdMapper {
    */
   Page<ShowGsd> getList(GsdQuery query);
 
+  QuarterTotalVO getGsdTotal();
+
 }

railway-business/src/main/java/com/railway/business/bi/mapper/ShowGsyMapper.java

@@ -3,6 +3,7 @@ package com.railway.business.bi.mapper;
 import com.github.pagehelper.Page;
 import com.railway.business.bi.domain.ShowGsy;
 import com.railway.business.bi.domain.vo.GsyQuery;
+import com.railway.business.bi.domain.vo.QuarterTotalVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -42,4 +43,6 @@ public interface ShowGsyMapper {
    */
   Page<ShowGsy> getList(GsyQuery query);
 
+  QuarterTotalVO getGsyTotal();
+
 }

railway-business/src/main/java/com/railway/business/bi/mapper/ShowYdtsMapper.java

@@ -3,7 +3,7 @@ package com.railway.business.bi.mapper;
 import com.github.pagehelper.Page;
 import com.railway.business.bi.domain.ShowYdts;
 import com.railway.business.bi.domain.vo.YdtsQuery;
-import com.railway.business.bi.domain.vo.YdtsTotalVO;
+import com.railway.business.bi.domain.vo.QuarterTotalVO;
 import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -45,6 +45,6 @@ public interface ShowYdtsMapper {
 
     List<String> getLineList();
 
-    YdtsTotalVO getYdtsTotal();
+    QuarterTotalVO getYdtsTotal();
 
 }

railway-business/src/main/java/com/railway/business/bi/service/impl/ChartServiceImpl.java

@@ -5,10 +5,12 @@ import com.railway.business.bi.domain.dto.SeriesDTO;
 import com.railway.business.bi.domain.vo.ChartVO;
 import com.railway.business.bi.domain.vo.SbxjVO;
 import com.railway.business.bi.domain.vo.TodoListVO;
-import com.railway.business.bi.domain.vo.YdtsTotalVO;
+import com.railway.business.bi.domain.vo.QuarterTotalVO;
 import com.railway.business.bi.mapper.ShowBdycMapper;
 import com.railway.business.bi.mapper.ShowBpdjxjhMapper;
 import com.railway.business.bi.mapper.ShowDlycMapper;
+import com.railway.business.bi.mapper.ShowGsdMapper;
+import com.railway.business.bi.mapper.ShowGsyMapper;
 import com.railway.business.bi.mapper.ShowSbxjMapper;
 import com.railway.business.bi.mapper.ShowYdtsMapper;
 import com.railway.business.bi.service.IChartService;
@@ -39,14 +41,19 @@ public class ChartServiceImpl implements IChartService {
   private final ShowBpdjxjhMapper bpdjxjhMapper;
   private final ShowSbxjMapper sbxjMapper;
   private final ShowYdtsMapper ydtsMapper;
+  private final ShowGsdMapper gsdMapper;
+  private final ShowGsyMapper gsyMapper;
 
   public ChartServiceImpl(ShowBdycMapper bdycMapper, ShowDlycMapper dlycMapper,
-      ShowBpdjxjhMapper bpdjxjhMapper, ShowSbxjMapper sbxjMapper, ShowYdtsMapper ydtsMapper) {
+      ShowBpdjxjhMapper bpdjxjhMapper, ShowSbxjMapper sbxjMapper, ShowYdtsMapper ydtsMapper,
+      ShowGsdMapper gsdMapper, ShowGsyMapper gsyMapper) {
     this.bdycMapper = bdycMapper;
     this.dlycMapper = dlycMapper;
     this.bpdjxjhMapper = bpdjxjhMapper;
     this.sbxjMapper = sbxjMapper;
     this.ydtsMapper = ydtsMapper;
+    this.gsdMapper = gsdMapper;
+    this.gsyMapper = gsyMapper;
   }
 
   /**
@@ -321,26 +328,8 @@ public class ChartServiceImpl implements IChartService {
   @Override
   public ChartVO getChartDlydts() {
     List<String> xAxis = createYearAxis();
-
-    YdtsTotalVO ydtsTotal = ydtsMapper.getYdtsTotal();
-    List<Integer> jhData = new ArrayList<>();
-    jhData.add(ydtsTotal.getPlan1());
-    jhData.add(ydtsTotal.getPlan2());
-    jhData.add(ydtsTotal.getPlan3());
-    jhData.add(ydtsTotal.getPlan4());
-
-    List<Integer> wcData = new ArrayList<>();
-    wcData.add(ydtsTotal.getActual1());
-    wcData.add(ydtsTotal.getActual2());
-    wcData.add(ydtsTotal.getActual3());
-    wcData.add(ydtsTotal.getActual4());
-
-    List<SeriesDTO> series = new ArrayList<>();
-    SeriesDTO jh = createSeriesDTO(xAxis, jhData, "计划");
-    SeriesDTO wc = createSeriesDTO(xAxis, wcData, "完成");
-    series.add(jh);
-    series.add(wc);
-
+    QuarterTotalVO ydtsTotal = ydtsMapper.getYdtsTotal();
+    List<SeriesDTO> series = getChartQuarterTotal(xAxis, ydtsTotal);
     String name = "电力远动调试";
     return createChartVO(xAxis, series, name);
   }
@@ -352,27 +341,9 @@ public class ChartServiceImpl implements IChartService {
    */
   @Override
   public ChartVO getChartDlsdxl() {
-    // TODO
     List<String> xAxis = createYearAxis();
-
-    List<Integer> jhData = new ArrayList<>();
-    jhData.add(9);
-    jhData.add(10);
-    jhData.add(15);
-    jhData.add(6);
-
-    List<Integer> wcData = new ArrayList<>();
-    wcData.add(9);
-    wcData.add(11);
-    wcData.add(13);
-    wcData.add(5);
-
-    List<SeriesDTO> series = new ArrayList<>();
-    SeriesDTO jh = createSeriesDTO(xAxis, jhData, "计划");
-    SeriesDTO wc = createSeriesDTO(xAxis, wcData, "完成");
-    series.add(jh);
-    series.add(wc);
-
+    QuarterTotalVO gsdTotal = gsdMapper.getGsdTotal();
+    List<SeriesDTO> series = getChartQuarterTotal(xAxis, gsdTotal);
     String name = "电力受电线路";
     return createChartVO(xAxis, series, name);
   }
@@ -384,29 +355,32 @@ public class ChartServiceImpl implements IChartService {
    */
   @Override
   public ChartVO getChartDlbpds() {
-    // TODO
     List<String> xAxis = createYearAxis();
+    QuarterTotalVO gsyTotal = gsyMapper.getGsyTotal();
+    List<SeriesDTO> series = getChartQuarterTotal(xAxis, gsyTotal);
+    String name = "电力变配电所";
+    return createChartVO(xAxis, series, name);
+  }
 
+  private List<SeriesDTO> getChartQuarterTotal(List<String> xAxis, QuarterTotalVO total){
     List<Integer> jhData = new ArrayList<>();
-    jhData.add(6);
-    jhData.add(7);
-    jhData.add(7);
-    jhData.add(6);
+    jhData.add(total.getPlan1());
+    jhData.add(total.getPlan2());
+    jhData.add(total.getPlan3());
+    jhData.add(total.getPlan4());
 
     List<Integer> wcData = new ArrayList<>();
-    wcData.add(6);
-    wcData.add(8);
-    wcData.add(6);
-    wcData.add(3);
+    wcData.add(total.getActual1());
+    wcData.add(total.getActual2());
+    wcData.add(total.getActual3());
+    wcData.add(total.getActual4());
 
     List<SeriesDTO> series = new ArrayList<>();
     SeriesDTO jh = createSeriesDTO(xAxis, jhData, "计划");
     SeriesDTO wc = createSeriesDTO(xAxis, wcData, "完成");
     series.add(jh);
     series.add(wc);
-
-    String name = "电力变配电所";
-    return createChartVO(xAxis, series, name);
+    return series;
   }
 
   /**

railway-business/src/main/resources/mapper/bi/ShowGsdMapper.xml

@@ -249,4 +249,34 @@
     </where>
   </select>
 
+  <resultMap id="TotalResultMap" type="com.railway.business.bi.domain.vo.QuarterTotalVO">
+    <result column="plan1" property="plan1"/>
+    <result column="plan2" property="plan3"/>
+    <result column="plan3" property="plan3"/>
+    <result column="plan4" property="plan4"/>
+    <result column="actual1" property="actual1"/>
+    <result column="actual2" property="actual2"/>
+    <result column="actual3" property="actual3"/>
+    <result column="actual4" property="actual4"/>
+  </resultMap>
+
+  <select id="getGsdTotal" resultMap="TotalResultMap">
+    select sum(plan1) as plan1, sum(plan2) as plan2, sum(plan3) as plan3, sum(plan4) as plan4,
+    sum(actual1) as actual1, sum(actual2) as actual2, sum(actual3) as actual3, sum(actual4) as actual4
+    from(
+      select
+      case when plan_month>=1 and plan_month <![CDATA[<=>]]> 3 then 1 else 0 end as plan1,
+      case when plan_month>=4 and plan_month <![CDATA[<=>]]> 6 then 1 else 0 end as plan2,
+      case when plan_month>=7 and plan_month <![CDATA[<=>]]> 9 then 1 else 0 end as plan3,
+      case when plan_month>=10 and plan_month <![CDATA[<=>]]> 12 then 1 else 0 end as plan4,
+      case when QUARTER(completion_date)=1 then 1 else 0 end as actual1,
+      case when QUARTER(completion_date)=2 then 1 else 0 end as actual2,
+      case when QUARTER(completion_date)=3 then 1 else 0 end as actual3,
+      case when QUARTER(completion_date)=4 then 1 else 0 end as actual4
+      from show_gsd
+      where del_flag='0'
+      and file_id = (select max(id) from show_file where data_type = 'scrw' and imp_result = '1')
+    ) a
+  </select>
+
 </mapper>

railway-business/src/main/resources/mapper/bi/ShowGsyMapper.xml

@@ -214,4 +214,34 @@
     </where>
   </select>
 
+  <resultMap id="TotalResultMap" type="com.railway.business.bi.domain.vo.QuarterTotalVO">
+    <result column="plan1" property="plan1"/>
+    <result column="plan2" property="plan3"/>
+    <result column="plan3" property="plan3"/>
+    <result column="plan4" property="plan4"/>
+    <result column="actual1" property="actual1"/>
+    <result column="actual2" property="actual2"/>
+    <result column="actual3" property="actual3"/>
+    <result column="actual4" property="actual4"/>
+  </resultMap>
+
+  <select id="getGsyTotal" resultMap="TotalResultMap">
+    select sum(plan1) as plan1, sum(plan2) as plan2, sum(plan3) as plan3, sum(plan4) as plan4,
+           sum(actual1) as actual1, sum(actual2) as actual2, sum(actual3) as actual3, sum(actual4) as actual4
+    from(
+      select
+        case when plan_month>=1 and plan_month <![CDATA[<=>]]> 3 then 1 else 0 end as plan1,
+        case when plan_month>=4 and plan_month <![CDATA[<=>]]> 6 then 1 else 0 end as plan2,
+        case when plan_month>=7 and plan_month <![CDATA[<=>]]> 9 then 1 else 0 end as plan3,
+        case when plan_month>=10 and plan_month <![CDATA[<=>]]> 12 then 1 else 0 end as plan4,
+        case when QUARTER(completion_date)=1 then 1 else 0 end as actual1,
+        case when QUARTER(completion_date)=2 then 1 else 0 end as actual2,
+        case when QUARTER(completion_date)=3 then 1 else 0 end as actual3,
+        case when QUARTER(completion_date)=4 then 1 else 0 end as actual4
+      from show_gsy
+      where del_flag='0'
+        and file_id = (select max(id) from show_file where data_type = 'scrw' and imp_result = '1')
+    ) a
+  </select>
+
 </mapper>

railway-business/src/main/resources/mapper/bi/ShowYdtsMapper.xml

@@ -241,7 +241,7 @@
     </where>
   </select>
 
-  <resultMap id="TotalResultMap" type="com.railway.business.bi.domain.vo.YdtsTotalVO">
+  <resultMap id="TotalResultMap" type="com.railway.business.bi.domain.vo.QuarterTotalVO">
     <result column="plan1" property="plan1"/>
     <result column="plan2" property="plan3"/>
     <result column="plan3" property="plan3"/>
@@ -257,10 +257,10 @@
     sum(actual1) as actual1, sum(actual2) as actual2, sum(actual3) as actual3, sum(actual4) as actual4
     from(
       select
-      case when plan_month>=1 and plan_month<=3 then 1 else 0 end as plan1,
-      case when plan_month>=4 and plan_month<=6 then 1 else 0 end as plan2,
-      case when plan_month>=7 and plan_month<=9 then 1 else 0 end as plan3,
-      case when plan_month>=10 and plan_month<=12 then 1 else 0 end as plan4,
+      case when plan_month>=1 and plan_month <![CDATA[<=>]]> 3 then 1 else 0 end as plan1,
+      case when plan_month>=4 and plan_month <![CDATA[<=>]]> 6 then 1 else 0 end as plan2,
+      case when plan_month>=7 and plan_month <![CDATA[<=>]]> 9 then 1 else 0 end as plan3,
+      case when plan_month>=10 and plan_month <![CDATA[<=>]]> 12 then 1 else 0 end as plan4,
       case when QUARTER(completion_date)=1 then 1 else 0 end as actual1,
       case when QUARTER(completion_date)=2 then 1 else 0 end as actual2,
       case when QUARTER(completion_date)=3 then 1 else 0 end as actual3,