update

dsk-admin/src/main/resources/application.yml

@@ -167,6 +167,7 @@ tenant:
     - d_project
     - d_subcontract
     - advisory_body
+    - advisory_body_project
     - dim_area
     - biz_dict_data
 

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/AdvisoryBodyMapper.xml

@@ -27,13 +27,14 @@
 
 
     <select id="queryListByBo" resultType="com.dsk.cscec.domain.vo.AdvisoryBodyVo">
-        select ab.advisory_body_id,ab.advisory_body_cid,ab.project_key,ab.advisory_body_name,ab.legal_person,
-        ab.legal_person_phone,ab.reg_address,ab.project_leader,ab.project_leader_major,ab.project_leader_phone,
-        ab.settle_start_time,ab.settle_finish_time,ab.is_final_judge_unit,
-        dp.project_name,dp.project_code,dp.province_name,dp.city_name,dp.isinvestproject,dp.project_type1,
-        dp.project_type,dp.contract_orig_value,dp.owner_name,dp.contract_org_name,dp.load_time
-        from advisory_body ab
-        left join d_project dp on dp.project_key = ab.project_key
+        select abp.advisory_body_id,abp.advisory_body_cid,abp.project_key,abp.project_leader,abp.project_leader_major,
+            abp.project_leader_phone,
+            ab.advisory_body_name,
+            dp.project_name,dp.project_code,dp.province_name,dp.city_name,dp.isinvestproject,dp.project_type1,
+            dp.project_type,dp.contract_orig_value,dp.owner_name,dp.contract_org_name,dp.load_time
+        from advisory_body_project abp
+        left join advisory_body ab on ab.advisory_body_id = abp.advisory_body_id
+        left join d_project dp on dp.project_key = abp.project_key
         <where>
             <if test="bo.advisoryBodyId != null and bo.advisoryBodyId != ''">
                 and ab.advisory_body_id = #{bo.advisoryBodyId}
@@ -50,25 +51,25 @@
             <if test="bo.contractOrgName != null and bo.contractOrgName != ''">
                 and dp.contract_org_name = #{bo.contractOrgName}
             </if>
-            <if test="bo.province != null and bo.city == null">
-                and province_name in
+            <if test="bo.province != null and bo.province.size > 0 and (bo.city == null or bo.city.size==0)">
+                and dp.province_name in
                 <foreach collection="bo.province" item="province" separator="," open="(" close=")">
                     #{province}
                 </foreach>
             </if>
-            <if test="bo.province == null and bo.city != null ">
-                and city_name in
+            <if test="(bo.province == null or bo.province.size==0) and bo.city != null and bo.city.size > 0 ">
+                and dp.city_name in
                 <foreach collection="bo.city" item="city" separator="," open="(" close=")">
                     #{city}
                 </foreach>
             </if>
-            <if test="bo.province != null and bo.city != null ">
+            <if test="bo.province != null and bo.province.size > 0  and bo.city != null  and bo.city.size > 0 ">
                 and (
-                province_name in
+                dp.province_name in
                 <foreach collection="bo.province" item="province" separator="," open="(" close=")">
                     #{province}
                 </foreach>
-                or city_name in
+                or dp.city_name in
                 <foreach collection="bo.city" item="city" separator="," open="(" close=")">
                     #{city}
                 </foreach>