提交代码

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

@@ -223,6 +223,12 @@
             <if test="params.regionalCompaniesCode != null and params.regionalCompaniesCode !=''">
                 and hph.regional_companies_code = #{params.regionalCompaniesCode}
             </if>
+            <if test="params.developerName!=null and params.developerName!=''">
+                and hph.developer_name like concat(concat('%',#{params.developerName}),'%')
+            </if>
+            <if test="params.financingCompaniesName!=null and params.financingCompaniesName!=''">
+                and info.financing_companies_name like concat(concat('%',#{params.financingCompaniesName}),'%')
+            </if>
             <if test="params.batchNo != null and params.batchNo !=''">
                 and info.batch_no = #{batchNo}
             </if>
@@ -307,6 +313,12 @@
             <if test="dto.regionCompanyId!=null and dto.regionCompanyId!=''">
                 and hygf_work_order.region_company_id =#{dto.regionCompanyId}
             </if>
+            <if test="dto.developerName!=null and dto.developerName!=''">
+                and hygf_work_order.amos_dealer_name like concat(concat('%',#{dto.developerName}),'%')
+            </if>
+            <if test="dto.regionalCompaniesName!=null and dto.regionalCompaniesName!=''">
+                and hygf_work_order.region_company_name like concat(concat('%',#{dto.regionalCompaniesName}),'%')
+            </if>
             <if test="dto.province != null and dto.province != ''">
                 and hygf_peasant_household.project_address like concat(concat('%',#{dto.province}),'%')
             </if>
@@ -342,6 +354,12 @@
             <if test="map.regionCompanyId!=null and map.regionCompanyId!=''">
                 and hygf_work_order.region_company_id =#{map.regionCompanyId}
             </if>
+            <if test="map.developerName!=null and map.developerName!=''">
+                and hygf_work_order.amos_dealer_name like concat(concat('%',#{map.developerName}),'%')
+            </if>
+            <if test="map.regionalCompaniesName!=null and map.regionalCompaniesName!=''">
+                and hygf_work_order.region_company_name like concat(concat('%',#{map.regionalCompaniesName}),'%')
+            </if>
             <if test="map.powerStationCode!=null and map.powerStationCode!=''">
                 and hph.peasant_household_no like concat('%',#{map.powerStationCode},'%')
             </if>
@@ -399,6 +417,12 @@
             <if test="map.regionCompanyId!=null and map.regionCompanyId!=''">
                 and hygf_work_order.region_company_id =#{map.regionCompanyId}
             </if>
+            <if test="map.developerName!=null and map.developerName!=''">
+                and hygf_work_order.amos_dealer_name like concat(concat('%',#{map.developerName}),'%')
+            </if>
+            <if test="map.regionalCompaniesName!=null and map.regionalCompaniesName!=''">
+                and hygf_work_order.region_company_name like concat(concat('%',#{map.regionalCompaniesName}),'%')
+            </if>
             <if test="map.powerStationCode!=null and map.powerStationCode!=''">
                 and hph.peasant_household_no like concat('%',#{map.powerStationCode},'%')
             </if>

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

@@ -115,26 +115,26 @@
         *
         FROM hygf_peasant_household
         WHERE is_delete = 0
-        ) ph
-        LEFT JOIN hygf_icbc_record icbc ON ph.amos_user_id = icbc.amos_user_id
-        LEFT JOIN ( SELECT amos_user_id, MAX ( payment_time ) payment_time, SUM ( payment_amount ) paymentAmount FROM hygf_icbc_withhold_record WHERE withhold_status = '成功' GROUP BY amos_user_id ) wr ON wr.amos_user_id = icbc.amos_user_id
-        <where>
-            1=1
         <if test="param.custName != null and param.custName != ''">
-                AND (ph.owners_name LIKE CONCAT('%', #{param.custName}, '%'))
+            AND (owners_name LIKE CONCAT('%', #{param.custName}, '%'))
         </if>
         <if test="param.idCard != null and param.idCard != ''">
-                AND (ph.id_card LIKE CONCAT('%', #{param.idCard}, '%') OR icbc.id_card LIKE CONCAT('%', #{param.idCard}, '%'))
+            AND (id_card LIKE CONCAT('%', #{param.idCard}, '%') OR icbc.id_card LIKE CONCAT('%', #{param.idCard}, '%'))
         </if>
         <if test="param.phone != null and param.phone != ''">
-                AND (ph.telephone LIKE CONCAT('%', #{param.phone}, '%') OR icbc.phone LIKE CONCAT('%', #{param.phone}, '%'))
+            AND (telephone LIKE CONCAT('%', #{param.phone}, '%') OR icbc.phone LIKE CONCAT('%', #{param.phone}, '%'))
         </if>
         <if test="param.regionalCompaniesName != null and param.regionalCompaniesName != ''">
-                AND ph.regional_companies_name LIKE CONCAT('%', #{param.regionalCompaniesName}, '%')
+            AND regional_companies_name LIKE CONCAT('%', #{param.regionalCompaniesName}, '%')
         </if>
         <if test="param.addressName != null and param.addressName != ''">
-                AND ph.project_address LIKE CONCAT('%', #{param.addressName}, '%')
+            AND project_address LIKE CONCAT('%', #{param.addressName}, '%')
         </if>
+        ) ph
+        LEFT JOIN hygf_icbc_record icbc ON ph.amos_user_id = icbc.amos_user_id
+        LEFT JOIN ( SELECT amos_user_id, MAX ( payment_time ) payment_time, SUM ( payment_amount ) paymentAmount FROM hygf_icbc_withhold_record WHERE withhold_status = '成功' GROUP BY amos_user_id ) wr ON wr.amos_user_id = icbc.amos_user_id
+        <where>
+            1=1
             <if test="param.type != null and param.type != ''">
                 AND icbc.type LIKE CONCAT('%', #{param.type}, '%')
             </if>
@@ -186,27 +186,30 @@
 		MAX(regional_companies_name) AS regional_companies_name,
 		MAX(project_address) AS project_address,
 		MAX(rec_date)  AS rec_date
-        FROM hygf_peasant_household GROUP BY amos_user_id
-        ) ph
-        LEFT JOIN hygf_icbc_record icbc ON ph.amos_user_id = icbc.amos_user_id
-        LEFT JOIN ( SELECT amos_user_id, MAX ( payment_time ) payment_time, SUM ( payment_amount ) paymentAmount FROM hygf_icbc_withhold_record WHERE withhold_status = '成功' GROUP BY amos_user_id ) wr ON wr.amos_user_id = icbc.amos_user_id
+        FROM hygf_peasant_household
         <where>
-             ph.is_delete = 0
+            is_delete = 0
             <if test="param.custName != null and param.custName != ''">
-                AND (ph.owners_name LIKE CONCAT('%', #{param.custName}, '%') OR icbc.cust_name LIKE CONCAT('%', #{param.custName}, '%'))
+                AND (owners_name LIKE CONCAT('%', #{param.custName}, '%')
             </if>
             <if test="param.idCard != null and param.idCard != ''">
-                AND (ph.id_card LIKE CONCAT('%', #{param.idCard}, '%') OR icbc.id_card LIKE CONCAT('%', #{param.idCard}, '%'))
+                AND (id_card LIKE CONCAT('%', #{param.idCard}, '%')
             </if>
             <if test="param.phone != null and param.phone != ''">
-                AND (ph.telephone LIKE CONCAT('%', #{param.phone}, '%') OR icbc.phone LIKE CONCAT('%', #{param.phone}, '%'))
+                AND (telephone LIKE CONCAT('%', #{param.phone}, '%')
             </if>
             <if test="param.regionalCompaniesName != null and param.regionalCompaniesName != ''">
-                AND ph.regional_companies_name LIKE CONCAT('%', #{param.regionalCompaniesName}, '%')
+                AND regional_companies_name LIKE CONCAT('%', #{param.regionalCompaniesName}, '%')
             </if>
             <if test="param.addressName != null and param.addressName != ''">
-                AND ph.project_address LIKE CONCAT('%', #{param.addressName}, '%')
+                AND project_address LIKE CONCAT('%', #{param.addressName}, '%')
             </if>
+        </where>
+        GROUP BY amos_user_id
+        ) ph
+        LEFT JOIN hygf_icbc_record icbc ON ph.amos_user_id = icbc.amos_user_id
+        LEFT JOIN ( SELECT amos_user_id, MAX ( payment_time ) payment_time, SUM ( payment_amount ) paymentAmount FROM hygf_icbc_withhold_record WHERE withhold_status = '成功' GROUP BY amos_user_id ) wr ON wr.amos_user_id = icbc.amos_user_id
+        <where>
             <if test="param != null">
                 <if test="param.openAccountStatus != null and param.openAccountStatus != ''">
                     <if test="param.openAccountStatus != '00'">

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

@@ -108,8 +108,8 @@ public class StatisticsHomepageServiceImpl {
         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("待登记","片区运营待审核","设计待审核/工程待审核","设计待审核","工程待审核","已完成","未通过","整改待审核" ,"待整改"));
-        List<String> acceptanceKeys = new ArrayList<>(Arrays.asList("待提交","已完成","片区运营待审核","投融待审核/法务待审核","投融待审核","法务待审核","资产待审核","整改待审核","待整改","未通过"));
+        List<String> gridKeys = new ArrayList<>(Arrays.asList("待登记","经销商管理员待审核","片区运营待审核","设计待审核/工程待审核","设计待审核","工程待审核","已完成","未通过","整改待审核" ,"待整改"));
+        List<String> acceptanceKeys = new ArrayList<>(Arrays.asList("待提交","经销商管理员待审核","片区运营待审核","投融待审核/法务待审核","投融待审核","法务待审核","资产待审核","已完成","整改待审核","待整改","未通过"));
         List<String> financingKeys = new ArrayList<>(Arrays.asList("未通过","已放款","放款完成","已推送","待推送","待放款"));
         List<Map<String, Object>> list = new ArrayList<>();
         switch(type){