更新2019.11.29-17:28

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/custom/controller/PropertyCompanyController.java

@@ -27,8 +27,8 @@ public class PropertyCompanyController {
      * @param [pageNum, pageSize]
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
-    public RestResponse propertyCompanies(@RequestParam Integer pageNum, @RequestParam Integer pageSize) {
-        return propertyCompanyService.propertyCompanyListResponse(pageNum, pageSize);
+    public RestResponse propertyCompanies(@RequestParam Long mtCompanyId,@RequestParam Integer pageNum, @RequestParam Integer pageSize) {
+        return propertyCompanyService.propertyCompanyListResponse(mtCompanyId,pageNum, pageSize);
     }
 
     @GetMapping("/{id}")
@@ -51,33 +51,33 @@ public class PropertyCompanyController {
     /**
      * @description 根据客户名称分页获取客户列表
      * @date 2019/11/27 11:37
-     * @param [name, current, size]
+     * @param [name, mtCompanyId, current, size]
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
-    public RestResponse propertyCompaniesFromName(@RequestParam String name, @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
-        return propertyCompanyService.propertyCompaniesFromRowName(pageNum, pageSize, "name", name);
+    public RestResponse propertyCompaniesFromName(@RequestParam String name,@RequestParam Long mtCompanyId, @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
+        return propertyCompanyService.propertyCompaniesFromRowName(mtCompanyId,pageNum, pageSize, "name", name);
     }
 
     @GetMapping("/list/address")
     /**
      * @description 根据客户地址分页获取客户列表
      * @date 2019/11/27 11:38
-     * @param [address, current, size]
+     * @param [address, mtCompanyId, current, size]
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
-    public RestResponse propertyCompaniesFromAddress(@RequestParam String address, @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
-        return propertyCompanyService.propertyCompaniesFromRowName(pageNum, pageSize, "address", address);
+    public RestResponse propertyCompaniesFromAddress(@RequestParam String address,@RequestParam Long mtCompanyId, @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
+        return propertyCompanyService.propertyCompaniesFromRowName(mtCompanyId,pageNum, pageSize, "address", address);
     }
 
     @GetMapping("/list/phone")
     /**
      * @description 根据客户电话分页获取客户列表
      * @date 2019/11/27 11:39
-     * @param [phone, current, size]
+     * @param [phone, mtCompanyId, current, size]
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
-    public RestResponse propertyCompaniesFromPhone(@RequestParam String phone, @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
-        return propertyCompanyService.propertyCompaniesFromRowName(pageNum, pageSize, "telephone", phone);
+    public RestResponse propertyCompaniesFromPhone(@RequestParam String phone, @RequestParam Long mtCompanyId,@RequestParam Integer pageNum, @RequestParam Integer pageSize) {
+        return propertyCompanyService.propertyCompaniesFromRowName(mtCompanyId,pageNum, pageSize, "telephone", phone);
     }
 
     @PostMapping("/add")
@@ -132,4 +132,24 @@ public class PropertyCompanyController {
 
         return RestResponse.ok(null, propertyCompanyService.delete(id));
     }
+
+    @GetMapping("/list/current")
+    public RestResponse currentProject(@RequestParam Long id) {
+    //分页查询正在服务的项目列表
+    //分页查询正在服务的项目列表
+    //分页查询正在服务的项目列表
+    //分页查询正在服务的项目列表
+    //分页查询正在服务的项目列表
+        return RestResponse.ok(null, "待实现");
+    }
+
+    @GetMapping("/list/previous")
+    public RestResponse previousProject(@RequestParam Long id) {
+    //分页查询曾经服务的项目列表
+    //分页查询曾经服务的项目列表
+    //分页查询曾经服务的项目列表
+    //分页查询曾经服务的项目列表
+    //分页查询曾经服务的项目列表
+        return RestResponse.ok(null, "待实现");
+    }
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/custom/dao/entity/model/PropertyCertificateResponse.java

@@ -1,4 +0,0 @@
-package cn.com.ty.lift.enterprise.custom.dao.entity.model;
-
-public class PropertyCertificateResponse {
-}

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/custom/dao/entity/model/PropertyCompanyListResponse.java

@@ -1,36 +0,0 @@
-package cn.com.ty.lift.enterprise.custom.dao.entity.model;
-
-import lombok.Data;
-
-@Data
-public class PropertyCompanyListResponse {
-    /**
-     * 甲方公司id
-     */
-    private Long id;
-
-    /**
-     * 编号
-     */
-    private String code;
-
-    /**
-     * 名称
-     */
-    private String name;
-
-    /**
-     * 地址
-     */
-    private String address;
-
-    /**
-     * 联系电话
-     */
-    private String telephone;
-
-    /**
-     * 在保台量
-     */
-    private Integer maintenanceLiftNum;
-}

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/custom/dao/entity/model/PropertyContactResponse.java

@@ -1,4 +0,0 @@
-package cn.com.ty.lift.enterprise.custom.dao.entity.model;
-
-public class PropertyContactResponse {
-}

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/custom/service/impl/PropertyCompanyServiceImpl.java

@@ -81,9 +81,11 @@ public class PropertyCompanyServiceImpl extends ServiceImpl<PropertyCompanyMappe
         return 888;
     }
 
-    public RestResponse propertyCompanyListResponse(Integer pageNum, Integer pageSize) {
+    public RestResponse propertyCompanyListResponse(Long mtCompanyId,Integer pageNum, Integer pageSize) {
         Page<PropertyCompany> page = new Page<>(pageNum, pageSize);
-        List<Map<String, Object>> records = this.pageMaps(page, new QueryWrapper<PropertyCompany>().select("id", "code", "name", "address", "telephone")).getRecords();
+        List<Map<String, Object>> records = this.pageMaps(page, new QueryWrapper<PropertyCompany>()
+                .select("id", "code", "name", "address", "telephone")
+                .eq("mt_company_id",mtCompanyId)).getRecords();
         records.forEach(record -> {
             record.put("maintenanceLiftNum", this.getMaintenanceLiftNum());
         });
@@ -91,9 +93,12 @@ public class PropertyCompanyServiceImpl extends ServiceImpl<PropertyCompanyMappe
     }
 
 
-    public RestResponse propertyCompaniesFromRowName(Integer pageNum, Integer pageSize, String rowName, Object rowValue) {
+    public RestResponse propertyCompaniesFromRowName(Long mtCompanyId,Integer pageNum, Integer pageSize, String rowName, Object rowValue) {
         Page<PropertyCompany> page = new Page<>(pageNum, pageSize);
-        List<Map<String, Object>> records = this.pageMaps(page, new QueryWrapper<PropertyCompany>().select("id", "code", "name", "address", "telephone").like(rowName, rowValue)).getRecords();
+        List<Map<String, Object>> records = this.pageMaps(page, new QueryWrapper<PropertyCompany>()
+                .select("id", "code", "name", "address", "telephone").like(rowName, rowValue)
+                .eq("mt_company_id",mtCompanyId))
+                .getRecords();
         records.forEach(record -> {
             record.put("maintenanceLiftNum", this.getMaintenanceLiftNum());
         });