修改告知分页查询

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/InstallNoticeMapper.xml

@@ -4,21 +4,34 @@
 
     <!--    查询安装告知申请页面-->
     <select id="installNoticePage" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticePageDto">
-        SELECT a.* ,u1.biz_org_name AS superviseDept,u2.biz_org_name AS chargerPerson,u3.biz_org_name AS inspectionUnit
-        FROM
-            (SELECT tz_ugp_install_notice.sequence_nbr,tz_ugp_project.name,install_region,start_date,construction_unit,charge_person,installation_unit,install_pri
-                  ,supervise_dept_id
-                  ,charger_person_id
-                  ,inspection_unit_id
-                  ,notice_status,notice_date
-             FROM tz_ugp_install_notice, tz_ugp_project ,tz_ugp_supervise_rule ,tz_ugp_verify
-             WHERE tz_ugp_install_notice.project_id=tz_ugp_project.sequence_nbr
-               AND tz_ugp_install_notice.project_id=tz_ugp_verify.project_id
-               AND tz_ugp_supervise_rule.admin_region_code=tz_ugp_project.install_region_code
-               AND tz_ugp_project.name LIKE  '%${name}%' AND construction_unit LIKE '%${constructionUnit}%') AS a
-                LEFT JOIN cb_org_usr AS u1 ON a.supervise_dept_id=u1.sequence_nbr
-                LEFT JOIN cb_org_usr AS u2 ON a.charger_person_id=u2.sequence_nbr
-                LEFT JOIN cb_org_usr AS u3 ON a.inspection_unit_id=u3.sequence_nbr
+        SELECT a.* ,u2.biz_org_name,u1.biz_org_name
+        FROM (SELECT
+                  tz_ugp_install_notice.sequence_nbr,
+                  tz_ugp_project.`NAME`,
+                  install_region,
+                  start_date,
+                  construction_unit,
+                  charge_person,
+                  installation_unit,
+                  install_pri,
+                  supervise_dept_id,
+                  inspection_unit_id,
+                  notice_status,
+                  notice_date
+              FROM
+                  tz_ugp_install_notice
+                      LEFT JOIN tz_ugp_project ON tz_ugp_install_notice.project_id = tz_ugp_project.sequence_nbr
+                      LEFT JOIN tz_ugp_supervise_rule ON tz_ugp_supervise_rule.admin_region_code = tz_ugp_project.install_region_code ) AS a
+                 LEFT JOIN cb_org_usr AS u2 ON a.inspection_unit_id = u2.sequence_nbr
+                 LEFT JOIN cb_org_usr AS u1 ON a.supervise_dept_id=u1.sequence_nbr
+        <where>
+            <if test="name != '' and name != null">
+                and a.`NAME` LIKE concat("%",#{name},"%")
+            </if>
+            <if test="constructionUnit != '' and constructionUnit != null">
+                and a.construction_unit LIKE concat("%",#{constructionUnit},"%")
+            </if>
+        </where>
     </select>
 
 <!--    //根据project_id查询一条数据-->