验收优化

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

@@ -11,11 +11,12 @@
         hbga.work_order_power_station_id workOrderPowerStationId,
         hbga.peasant_household_id peasantHouseholdId,
         hbga.basic_grid_node basicGridNode,
-        hbga.grid_time gridTime,
+        hbga.acceptance_time acceptanceTime,
         hbga.power_station_area_status powerStationAreaStatus,
-        hbga.power_station_design_status powerStationDesignStatus,
+        hbga.power_station_financing_status powerStationFinancingStatus,
+        hbga.power_station_assets_status powerStationAssetsStatus,
         hbga.rectification_status rectificationStatus,
-        hbga.power_station_engineering_status powerStationEngineeringStatus,
+        hbga.power_station_legal_status powerStationLegalStatus,
         hbga.instance_id instanceId,
         hph.developer_name as serviceAgent,
         hph.regional_companies_name AS regionalCompaniesName,
@@ -23,18 +24,18 @@
         hph.peasant_household_no peasantHouseholdNo,
         hph.project_address_name projectAddressName,
         DATE_FORMAT(hogaa.grid_connection_time, '%Y-%m-%d %H:%i:%S') AS gridConnectionTime,
-        CASE WHEN hbga.grid_status = '1' THEN '待登记'
-        WHEN hbga.grid_status = '2' THEN '经销商管理员待审核'
-        WHEN hbga.grid_status = '3' THEN '已完成'
-        WHEN hbga.grid_status = '4' THEN '未通过'
-        WHEN hbga.grid_status = '5' THEN '设计待审核'
-        WHEN hbga.grid_status = '6' THEN '设计待审核/工程待审核'
-        WHEN hbga.grid_status = '7' THEN '片区运营待审核'
-        WHEN hbga.grid_status = '8' THEN '工程待审核'
-        WHEN hbga.grid_status = '9' THEN '整改待审核'
-        ELSE '待整改' END AS gridStatus
+        CASE WHEN hbga.acceptance_check_status = '15' THEN '待提交验收'
+        WHEN hbga.acceptance_check_status = '2' THEN '经销商管理员待审核'
+        WHEN hbga.acceptance_check_status = '3' THEN '已完成'
+        WHEN hbga.acceptance_check_status = '4' THEN '未通过'
+        WHEN hbga.acceptance_check_status = '11' THEN '投融待审核/法务待审核'
+        WHEN hbga.acceptance_check_status = '7' THEN '片区运营待审核'
+        WHEN hbga.acceptance_check_status = '12' THEN '投融待审核'
+        WHEN hbga.acceptance_check_status = '13' THEN '资产待审核'
+        WHEN hbga.acceptance_check_status = '14' THEN '法务待审核'
+        ELSE '待整改' END AS acceptanceCheckStatus
         FROM
-        hygf_basic_grid_record hbga
+        hygf_acceptance_check hbga
         LEFT JOIN hygf_peasant_household hph ON hph.sequence_nbr = hbga.peasant_household_id
         LEFT JOIN hygf_on_grid_and_acceptance hogaa ON hogaa.work_order_power_station_id = hbga.work_order_power_station_id
         LEFT JOIN hygf_work_order  ON hygf_work_order.sequence_nbr = hbga.work_order_id
@@ -65,7 +66,7 @@
                 AND hph.owners_name LIKE concat(concat('%', #{map.ownersName}), '%')
             </if>
             <if test="map.gridStatus != null and map.gridStatus !=''">
-                AND hbga.grid_status = #{map.gridStatus}
+                AND hbga.acceptance_check_status = #{map.gridStatus}
             </if>
             <if test="map.gridConnectionTime != null">
                 AND DATE_FORMAT(hogaa.grid_connection_time, '%Y-%m-%d') = #{map.gridConnectionTime}