From 3d72b83b87c3a7a55756caa2663e8be01e2df5ae Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sat, 6 May 2023 13:29:43 +0800
Subject: [PATCH] =?UTF-8?q?gov/org/propertymanagement/page=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=81=94=E7=B3=BB=E4=BA=BA=EF=BC=8C=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E7=94=B5=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/PropertyManagementController.java  | 3 ++-
 .../main/java/com/epmet/dao/IcPropertyManagementDao.java    | 5 ++++-
 .../java/com/epmet/service/PropertyManagementService.java   | 2 +-
 .../epmet/service/impl/PropertyManagementServiceImpl.java   | 2 +-
 .../src/main/resources/mapper/IcPropertyManagementDao.xml   | 6 ++++++
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java
index 047a98d802..d65ba66296 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java
@@ -56,7 +56,8 @@ public class PropertyManagementController {
     @PostMapping("page")
     public Result<PageData<IcPropertyManagementDTO>> page(@RequestBody IcPropertyManagementFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO,IcPropertyManagementFormDTO.PageGroup.class);
-       return  new Result<PageData<IcPropertyManagementDTO>>().ok(propertyManagementService.page(formDTO.getPageNo(),formDTO.getPageSize(),formDTO.getName()));
+       return  new Result<PageData<IcPropertyManagementDTO>>().ok(propertyManagementService.page(formDTO.getPageNo(),formDTO.getPageSize(),formDTO.getName(),
+               formDTO.getContactName(),formDTO.getContactMobile()));
     }
 
     /**
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPropertyManagementDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPropertyManagementDao.java
index 915b2f6d7d..69124d0459 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPropertyManagementDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPropertyManagementDao.java
@@ -59,5 +59,8 @@ public interface IcPropertyManagementDao extends BaseDao<IcPropertyManagementEnt
      */
     List<IcPropertyManagementDTO> selectPropertyNameList(String neighborhoodId);
 
-    List<IcPropertyManagementDTO> queryList(@Param("customerId") String customerId,@Param("name")String name);
+    List<IcPropertyManagementDTO> queryList(@Param("customerId") String customerId,
+                                            @Param("name")String name,
+                                            @Param("contactName") String contactName,
+                                            @Param("contactMobile") String contactMobile);
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java
index f3f77cde27..cae9715bd1 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java
@@ -39,5 +39,5 @@ public interface PropertyManagementService  {
     void update(IcPropertyManagementFormDTO formDTO);
     void delete(IcPropertyManagementFormDTO formDTO);
 
-    PageData<IcPropertyManagementDTO> page(Integer pageNo, Integer pageSize, String name);
+    PageData<IcPropertyManagementDTO> page(Integer pageNo, Integer pageSize, String name,String contactName,String contactMobile);
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java
index cb782f36d7..643cdbacb9 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java
@@ -119,7 +119,7 @@ public class PropertyManagementServiceImpl implements PropertyManagementService
      * @return
      */
     @Override
-    public PageData<IcPropertyManagementDTO> page(Integer pageNo, Integer pageSize, String name) {
+    public PageData<IcPropertyManagementDTO> page(Integer pageNo, Integer pageSize, String name,String contactName,String contactMobile) {
         PageHelper.startPage(pageNo,pageSize);
         List<IcPropertyManagementDTO> list=icPropertyManagementDao.queryList(EpmetRequestHolder.getLoginUserCustomerId(),name);
         PageInfo<IcPropertyManagementDTO> pageInfo = new PageInfo<>(list);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml
index 045514482f..2035e53020 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml
@@ -80,6 +80,12 @@
         <if test="name != null and name != ''">
            and m.name like concat('%',#{name},'%')
         </if>
+        <if test="contactName != null and contactName != ''">
+            and m.CONTACT_NAME like concat('%',#{contactName},'%')
+        </if>
+        <if test="contactMobile != null and contactMobile != ''">
+            and m.CONTACT_MOBILE like concat('%',#{contactMobile},'%')
+        </if>
         order by m.CREATED_TIME desc
     </select>
 </mapper>
\ No newline at end of file