gov/org/propertymanagement/page新增联系人，联系电话

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()));
     }
 
     /**

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);
 }

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);
 }

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);

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>