统计首页开发

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/StatisticsHomepageMapper.xml

@@ -5,7 +5,7 @@
     <select id="surveyStatusTotal" resultType="map">
         SELECT
         SUM(CASE WHEN ps.process_status = '不通过' THEN 1 ELSE 0 END)AS '未通过',
-        SUM(CASE WHEN ps.process_status = '进行中' AND ps.business_status = '通过' THEN 1 ELSE 0 END)  AS '已完成(法务审核)',
+        SUM(CASE WHEN ps.process_status = '进行中' AND ps.business_status = '通过' AND next_node_name = '设计上传典型图库' THEN 1 ELSE 0 END)  AS '已完成(法务审核)',
         SUM(CASE WHEN ps.process_status = '完成' THEN 1 ELSE 0 END)  AS completeTotal,
         SUM(CASE WHEN ps.process_status = '进行中' AND (ps.business_status IS NULL OR ps.design_status IS NULL OR ps.technology_status IS NULL) THEN 1 ELSE 0 END)  AS '进行中(审核)',
         (		SELECT count(*)  FROM hygf_peasant_household WHERE construction_state = '待勘察' and is_delete = 0
@@ -54,7 +54,8 @@
 
         SUM(CASE WHEN status  = '未签署' and  initiate_status = '未发起' THEN 1 ELSE 0 END)  AS '未发起',
         SUM(CASE WHEN status  = '双方已签署' THEN 1 ELSE 0 END)  AS '双方已签署',
-        SUM(CASE WHEN status  = '农户已签署' THEN 1 ELSE 0 END)  AS '农户已签署'
+        SUM(CASE WHEN status  = '农户已签署' THEN 1 ELSE 0 END)  AS '农户已签署',
+        SUM(CASE WHEN status  = '已作废' THEN 1 ELSE 0 END)  AS '已作废'
         FROM
         hygf_household_contract
         LEFT JOIN
@@ -79,13 +80,15 @@
 
     <select id="desionTotal" resultType="map">
         SELECT
-        count( typical_diagram ) '典设图已上传',
-        SUM( CASE WHEN component_layout IS NOT NULL THEN 1 ELSE 0 END ) AS '施工图已上传'
+        SUM( CASE WHEN next_node_name = '经销商设计人员上传设计图' THEN 1 ELSE 0 END ) AS '施工图已上传',
+        SUM( CASE WHEN next_node_name = '设计上传典型图库' THEN 1 ELSE 0 END ) AS '典设图已上传'
         FROM
-        hygf_design_information
+        `hygf_power_station`
         LEFT JOIN
-        hygf_peasant_household ON hygf_design_information.peasant_household_id = hygf_peasant_household.sequence_nbr
+        hygf_peasant_household ON hygf_power_station.peasant_household_id = hygf_peasant_household.sequence_nbr
         <where>
+            next_node_name IN ( '经销商设计人员上传设计图', '设计上传典型图库' )
+            AND process_status = '进行中'
             <if test="developerCode != null and developerCode != ''">
                 AND hygf_peasant_household.developer_code = #{developerCode}
             </if>
@@ -107,7 +110,7 @@
 
     <select id="preparationMoneyTotal" resultType="map">
         SELECT
-        SUM( CASE WHEN preparation_money_state = '待发货' or preparation_money_state = '暂存发货'   THEN 1 ELSE 0 END )  AS '待发货',
+        SUM( CASE WHEN preparation_money_state = '待发货' or preparation_money_state = '暂存发货'or preparation_money_state = '待补货'     THEN 1 ELSE 0 END )  AS '待发货',
         SUM( CASE WHEN preparation_money_state = '备货完成'  THEN 1 ELSE 0 END )  AS '已收货',
         SUM( CASE WHEN preparation_money_state = '待收货'  THEN 1 ELSE 0 END )  AS '已发货'
         FROM
@@ -139,8 +142,9 @@
         WHEN power_station_construction_status = '施工中' or  power_station_construction_status = '待登记' THEN '施工资料已上传'
         WHEN power_station_construction_status = '待审核' and  work_order_power_station_node IS NULL THEN '完工登记'
         WHEN power_station_construction_status = '待审核' and  work_order_power_station_node ='area' THEN '完工自审'
+        WHEN power_station_construction_status = '已完成' and  work_order_power_station_node ='area' THEN '已完成'
         WHEN power_station_construction_status = '待审核' and  work_order_power_station_node in ('engineering','design')   THEN '审核中'
-        ELSE '已完成' END )
+        ELSE power_station_construction_status END )
         AS statusText,
         ROUND(COALESCE(SUM(ei.real_scale), 0), 2) AS realScale        FROM
         hygf_work_order_power_station

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/StatisticsHomepageServiceImpl.java

@@ -75,8 +75,8 @@ public class StatisticsHomepageServiceImpl {
 
 
         List<String> surveKeys = new ArrayList<>(Arrays.asList("未通过","未勘察","已完成(法务审核)","进行中(审核)"));
-        List<String> contractKeys = new ArrayList<>(Arrays.asList("双方已签署","农户已签署","未发起"));
-        List<String> workOrder = new ArrayList<>(Arrays.asList("派工发料","未通过","施工资料已上传","完工登记","完工自审","审核中","已完成"));
+        List<String> contractKeys = new ArrayList<>(Arrays.asList("双方已签署","农户已签署","未发起","已作废"));
+        List<String> workOrder = new ArrayList<>(Arrays.asList("派工发料","未通过","施工资料已上传","完工登记","完工自审","审核中","已完成","整改待审核" ,"待整改"));
         List<String> preparationMoneyKeys = new ArrayList<>(Arrays.asList("待发货","已收货","已发货"));
         List<String> desionKeys = new ArrayList<>(Arrays.asList("施工图已上传","典设图已上传"));
         List<String> gridKeys = new ArrayList<>(Arrays.asList("待登记","审核中","已完成","未通过","整改待审核" ,"待整改"));
@@ -113,11 +113,13 @@ public class StatisticsHomepageServiceImpl {
                     list =    this.nullDataBuildResult(list,desionKeys);
                 }else {
                     Map<String, Object> desion = maps.get(0);
+                    long surveNum = (long) li.get("surveNum");
                     desionKeys.removeAll(desion.keySet());
                     for (String e : desion.keySet()) {
                         list.add( MapBuilder.<String, Object>create().put("statusText",e).put("total",desion.get(e)).build());
-
+                        sureyNum += new BigDecimal(desion.get(e).toString()).longValue();
                     }
+                    li.put("surveNum",sureyNum);
                     list =    this.nullDataBuildResult(list,desionKeys);
                     if (resultMap.containsKey("sureyComplete")){
                         list.add( MapBuilder.<String, Object>create().put("statusText","审核完成").put("total",resultMap.get("sureyComplete")).build());