咨询机构合作记录修改

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/AdvisoryBodyBo.java

@@ -39,6 +39,10 @@ public class AdvisoryBodyBo extends BaseEntity {
      * 项目承接单位
      */
     private String contractOrgName;
+    /**
+     * 区域
+     */
+    private List<String> area;
     /**
      * 省份
      */

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/AdvisoryBodyVo.java

@@ -112,8 +112,8 @@ public class AdvisoryBodyVo {
     private String contractOrgName;
 
     /**
-     * 创建时间
+     * 创建时间/合同生效(盖章)日期
      */
     @ExcelProperty(value = "创建时间", index = 13)
-    private Date loadTime;
+    private Date contractSignDate;
 }

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

@@ -14,7 +14,7 @@
         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
+        dp.project_type,dp.contract_orig_value,dp.owner_name,dp.contract_org_name,dp.contract_sign_date
         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
@@ -34,32 +34,31 @@
             <if test="bo.contractOrgName != null and bo.contractOrgName != ''">
                 and dp.contract_org_name = #{bo.contractOrgName}
             </if>
-            <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 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.province.size > 0  and bo.city != null  and bo.city.size > 0 ">
-                and (
-                dp.province_name in
-                <foreach collection="bo.province" item="province" separator="," open="(" close=")">
-                    #{province}
-                </foreach>
-                or dp.city_name in
-                <foreach collection="bo.city" item="city" separator="," open="(" close=")">
-                    #{city}
-                </foreach>
-                )
+            <if test="bo.area != null and bo.area.size > 0 or (bo.province != null and bo.province.size > 0) or (bo.city != null and bo.city.size > 0)">
+                and
+                <trim prefix="(" suffix=")" prefixOverrides="or">
+                    <if test="bo.area != null and bo.area.size > 0 ">
+                        or dp.area_name in
+                        <foreach collection="bo.area" item="areaName" open="(" close=")" separator=",">
+                            #{areaName}
+                        </foreach>
+                    </if>
+                    <if test="bo.province != null and bo.province.size > 0 ">
+                        or dp.province_name in
+                        <foreach collection="bo.province" item="provinceName" open="(" close=")" separator=",">
+                            #{provinceName}
+                        </foreach>
+                    </if>
+                    <if test="bo.city != null and bo.city.size > 0 ">
+                        or dp.city_name in
+                        <foreach collection="bo.city" item="cityName" open="(" close=")" separator=",">
+                            #{cityName}
+                        </foreach>
+                    </if>
+                </trim>
             </if>
         </where>
-        order by dp.load_time desc
+        order by dp.contract_sign_date desc
     </select>
 
     <select id="selectAdvisoryBodyCidsByName" resultType="java.lang.Long">