Merge remote-tracking branch 'origin/developer_bw' into developer_bw

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

@@ -85,6 +85,7 @@
         hygf_design_information
         LEFT JOIN
         hygf_peasant_household ON hygf_design_information.peasant_household_id = hygf_peasant_household.sequence_nbr
+        <where>
             <if test="developerCode != null and developerCode != ''">
                 AND hygf_peasant_household.developer_code = #{developerCode}
             </if>
@@ -100,6 +101,8 @@
             <if test="district != null and district != ''">
                 AND hygf_peasant_household.project_address LIKE CONCAT ('%',#{district},'%')
             </if>
+        </where>
+
     </select>
 
     <select id="preparationMoneyTotal" resultType="map">
@@ -145,6 +148,7 @@
         hygf_power_station_engineering_info ei on ei.work_order_power_station_id =hygf_work_order_power_station.sequence_nbr
         LEFT JOIN
         hygf_peasant_household ON hygf_work_order_power_station.peasant_household_id = hygf_peasant_household.sequence_nbr
+        <where>
             <if test="developerCode != null and developerCode != ''">
                 AND hygf_peasant_household.developer_code = #{developerCode}
             </if>
@@ -160,6 +164,7 @@
             <if test="district != null and district != ''">
                 AND hygf_peasant_household.project_address LIKE CONCAT ('%',#{district},'%')
             </if>
+        </where>
         GROUP BY
         power_station_construction_status,work_order_power_station_node
     </select>
@@ -183,6 +188,7 @@
         LEFT JOIN hygf_work_order_power_station ps ON ps.sequence_nbr = hygf_basic_grid_record.work_order_power_station_id
         LEFT JOIN hygf_power_station_engineering_info ei ON ei.work_order_power_station_id = ps.sequence_nbr
         LEFT JOIN hygf_peasant_household ON hygf_basic_grid_record.peasant_household_id = hygf_peasant_household.sequence_nbr
+        <where>
             <if test="developerCode != null and developerCode != ''">
                 AND hygf_peasant_household.developer_code = #{developerCode}
             </if>
@@ -198,6 +204,7 @@
             <if test="district != null and district != ''">
                 AND hygf_peasant_household.project_address LIKE CONCAT ('%',#{district},'%')
             </if>
+        </where>
         GROUP BY
         grid_status
     </select>
@@ -227,6 +234,7 @@
         hygf_power_station_engineering_info ei ON ei.work_order_power_station_id = ps.sequence_nbr
         LEFT JOIN
         hygf_peasant_household ON hygf_acceptance_check.peasant_household_id = hygf_peasant_household.sequence_nbr
+        <where>
             <if test="developerCode != null and developerCode != ''">
                 AND hygf_peasant_household.developer_code = #{developerCode}
             </if>
@@ -242,6 +250,7 @@
             <if test="district != null and district != ''">
                 AND hygf_peasant_household.project_address LIKE CONCAT ('%',#{district},'%')
             </if>
+        </where>
         GROUP BY
         acceptance_check_status
     </select>
@@ -257,6 +266,7 @@
         LEFT JOIN hygf_work_order_power_station ps ON ps.peasant_household_id = hygf_financing_info.peasant_household_id
         LEFT JOIN hygf_power_station_engineering_info ei ON ei.work_order_power_station_id = ps.sequence_nbr
         LEFT JOIN hygf_peasant_household ON hygf_financing_info.peasant_household_id = hygf_peasant_household.sequence_nbr
+        <where>
             <if test="developerCode != null and developerCode != ''">
                 AND hygf_peasant_household.developer_code = #{developerCode}
             </if>
@@ -272,6 +282,7 @@
             <if test="district != null and district != ''">
                 AND hygf_peasant_household.project_address LIKE CONCAT ('%',#{district},'%')
             </if>
+        </where>
         GROUP BY
         status