更新

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

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.enterprise.custom.controller;
 
+import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.enterprise.custom.dao.entity.PropertyCompany;
 import cn.com.ty.lift.enterprise.custom.dao.entity.model.PropertyCompanyAndPropertyContactReq;
 import cn.com.ty.lift.enterprise.custom.dao.entity.model.PropertyCompanyReq;
@@ -97,6 +98,17 @@ public class PropertyCompanyController {
         }
         return RestResponse.ok(propertyCompanies, "1", "查询成功");
     }
+    /**
+         * @description 项目模块，新增客户
+         * @date 2019/12/16 17:08
+         */
+    @PostMapping("/project/custom/add")
+    public RestResponse customAdd(@RequestBody PropertyCompany propertyCompany) {
+        if (propertyCompanyService.save(propertyCompany)) {
+            return RestResponse.ok(propertyCompany.getId(), ApiConstants.RESULT_SUCCESS, "新增成功");
+        }
+        return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "新增失败");
+    }
 
     @GetMapping("/export")
     public RestResponse export(HttpServletRequest request, HttpServletResponse response) {

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

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.enterprise.custom.controller;
 
+import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.enterprise.custom.dao.entity.PropertyContact;
 import cn.com.ty.lift.enterprise.custom.dao.entity.model.PropertyContactReq;
 import cn.com.ty.lift.enterprise.custom.service.PropertyCompanyService;
@@ -92,11 +93,23 @@ public class PropertyContactController {
     @PostMapping("/project/contacts")
     public RestResponse customs(@RequestBody PropertyContact propertyContact) {
         List<PropertyContact> propertyCompanies = propertyContactService.list(new QueryWrapper<PropertyContact>()
-                .select("id", "name")
+                .select("id", "name", "telephone")
                 .eq("pp_company_id", propertyContact.getPpCompanyId()));
         if (propertyCompanies.isEmpty()) {
-            return RestResponse.ok(null, "9", "无数据");
+            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
+        }
+        return RestResponse.ok(propertyCompanies, ApiConstants.RESULT_SUCCESS, "查询成功");
+    }
+
+    /**
+         * @description 项目模块，新增客户联系人
+         * @date 2019/12/16 17:09
+         */
+    @PostMapping("/project/contact/add")
+    public RestResponse customAdd(@RequestBody PropertyContact propertyContact) {
+        if (propertyContactService.save(propertyContact)) {
+            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "新增成功");
         }
-        return RestResponse.ok(propertyCompanies, "1", "查询成功");
+        return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "新增失败");
     }
 }

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

@@ -85,9 +85,10 @@ public class PropertyCompanyServiceImpl extends ServiceImpl<PropertyCompanyMappe
                         .like(propertyCompany.getTelephone() != null, "telephone", propertyCompany.getTelephone())
                         .like(propertyCompany.getMailingAddress() != null, "mailing_address", propertyCompany.getMailingAddress()));
         if (records.getRecords().isEmpty()) {
-            return RestResponse.ok(null, "9", "无数据");
+            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
         }
-        return RestResponse.ok(records, "1", "查询成功");
+        System.out.println(records);
+        return RestResponse.ok(records, ApiConstants.RESULT_SUCCESS, "查询成功");
     }
 
     public RestResponse saveAll(PropertyCompanyAndPropertyContactReq req) {

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/organization/controller/OrganizationController.java

@@ -15,12 +15,12 @@ import org.springframework.web.bind.annotation.RestController;
 public class OrganizationController {
     private final OrganizationService organizationService;
     @PostMapping("/list")
-    public RestResponse list(@RequestBody OrganizationReq organizationReq){
-        return organizationService.datas(organizationReq);
+    public RestResponse list(@RequestBody OrganizationReq req){
+        return organizationService.datas(req);
     }
 
-    @PostMapping("/test")
-    public RestResponse test(@RequestBody OrganizationReq req){
-        return organizationService.organizationList(req);
-    }
+//    @PostMapping("/test")
+//    public RestResponse test(@RequestBody OrganizationReq req){
+//        return organizationService.organizationList(req);
+//    }
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/organization/dao/entity/Organization.java

@@ -8,6 +8,6 @@ import java.util.ArrayList;
 public class Organization {
     private String areaName;
     private String parentName;
-    private Object data;
-    private ArrayList<Project> projects = new ArrayList<>();
+    private ArrayList<Organization> child;
+    private ArrayList<Project> projects;
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/organization/dao/entity/model/OrganizationReq.java

@@ -10,4 +10,8 @@ public class OrganizationReq {
     private Integer listType;
     //项目id
     private Long projectId;
+
+    private String province;
+    private String city;
+    private String district;
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/organization/dao/mapper/ProjectMapper.java

@@ -2,6 +2,11 @@ package cn.com.ty.lift.enterprise.organization.dao.mapper;
 
 import cn.com.ty.lift.enterprise.organization.dao.entity.Project;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProjectMapper extends BaseMapper<Project> {
 
+    @Select("select distinct province from project where mt_company_id = ${mtCompanyId}")
+    List<HashMap<String,String>> provinces(@Param("mtCompanyId") Long mtCompanyId);
+
+    @Select("select distinct city from project where mt_company_id = ${mtCompanyId} and province=${province}")
+    List<HashMap<String,String>> cities(@Param("mtCompanyId") Long mtCompanyId, @Param("province") String province);
+
+    @Select("select distinct district from project where mt_company_id = ${mtCompanyId} and city=${city}")
+    List<HashMap<String,String>> districts(@Param("mtCompanyId") Long mtCompanyId, @Param("city") String city);
+
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/organization/service/OrganizationService.java

@@ -83,70 +83,19 @@ public class OrganizationService {
         return RestResponse.ok(allData, ApiConstants.RESULT_SUCCESS, "查询成功");
     }
 
-    public RestResponse organizationList(OrganizationReq req) {
-//        List<Map<String, Object>> projects = mapper.list("province, city, district,id, project_name, num",
-//                "project",
-//                "where mt_company_id=" + req.getMtCompanyId());
-        List<Project> projects = projectService.list(new QueryWrapper<Project>()
-                .select("id", "province", "city", "district", "project_name", "num")
-                .eq("mt_company_id", req.getMtCompanyId()));
-//        HashSet<Organization> provinces = new HashSet<>();
-        Map<String, Organization> provinces = new HashMap<>();
-//        HashSet<Organization> cities = new HashSet<>();
-        Map<String, Organization> cities = new HashMap<>();
-//        HashSet<Organization> districts = new HashSet<>();
-        Map<String, Organization> districts = new HashMap<>();
-        Organization province = new Organization();
-        Organization city = new Organization();
-        Organization district = new Organization();
-
-        //遍历项目
-        for (Project project : projects) {
-            //获取省
-            province.setAreaName(project.getProvince());
-            province.setParentName(project.getProvince());
-            //获取市
-            city.setAreaName(project.getCity());
-            city.setParentName(project.getProvince());
-            //获取区
-            district.setAreaName(project.getDistrict());
-            district.setParentName(project.getCity());
-
-            //新增区列表，区新增项目
-            Organization organization = districts.get(project.getDistrict());
-            if (organization != null) {
-                //如果区列表不为空
-                organization.getProjects().add(project);
-            } else {
-                //如果区列表为空
-                organization = new Organization();
-                organization.getProjects().add(project);
-                districts.put(project.getDistrict(), organization);
-            }
-
-            //区列表放入市中
-            city.setData(districts);
-
-            //市放入市列表中
-            city.setParentName(project.getProvince());
-            cities.putIfAbsent(project.getCity(), city);
-            //市列表放入省中
-            province.setData(cities);
-
-            //省放入省列表中
-            provinces.putIfAbsent(project.getCity(), province);
-
-
-            //遍历完一个项目，重新赋值变量
-            province = new Organization();
-            city = new Organization();
-            district = new Organization();
-
+    public void organization(OrganizationReq req) {
+        List<HashMap<String, String>> areas;
+        if (req.getDistrict() != null) {
+            List<Project> projects = projectService.list(new QueryWrapper<Project>()
+                    .select("id", "project_name", "num")
+                    .eq("mt_compant_id", req.getMtCompanyId())
+                    .eq("district", req.getDistrict()));
+        } else if (req.getProvince() != null) {
+            areas = projectService.getBaseMapper().cities(req.getMtCompanyId(), req.getProvince());
+        } else if (req.getCity() != null) {
+            areas = projectService.getBaseMapper().districts(req.getMtCompanyId(), req.getCity());
         }
-        //输出地区信息
-        System.out.println(provinces);
 
-
-        return RestResponse.ok(districts, ApiConstants.RESULT_SUCCESS, "查询成功");
     }
+
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/controller/RegionController.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -29,6 +30,22 @@ public class RegionController {
     private final RegionServiceImpl regionService;
     private final CommonMapper mapper;
 
+    @PostMapping
+    public RestResponse region(@RequestBody Region region) {
+        region = regionService.getById(region.getId());
+        Map<String, Object> regionUser = mapper.one(" u.name ",
+                " region r left join user_info u on u.user_id = r.user_id ",
+                " where r.user_id = " + region.getUserId() + " and r.id = " + region.getId());
+        Map<String, Object> regionClerk = mapper.one(" u.name ",
+                " region r left join user_info u on u.user_id = r.clerk ",
+                " where r.clerk = " + region.getClerk() + " and r.id = " + region.getId());
+        HashMap<String, Object> data = new HashMap<>();
+        data.put("regionUser", regionUser);
+        data.put("regionClerk", regionClerk);
+        return RestResponse.ok(data, ApiConstants.RESULT_SUCCESS, "查询成功");
+    }
+
+
     @PostMapping("/list")
     public RestResponse list(@RequestBody RegionReq regionReq) {
         return regionService.regions(regionReq);
@@ -55,14 +72,14 @@ public class RegionController {
         return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "修改失败");
     }
 
-    @PostMapping
-    public RestResponse get(@RequestBody Region region) {
-        Region byId = regionService.getById(region.getId());
-        if (null == byId) {
-            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "未找到");
-        }
-        return RestResponse.ok(byId, ApiConstants.RESULT_SUCCESS, "查询成功");
-    }
+//    @PostMapping
+//    public RestResponse get(@RequestBody Region region) {
+//        Region byId = regionService.getById(region.getId());
+//        if (null == byId) {
+//            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "未找到");
+//        }
+//        return RestResponse.ok(byId, ApiConstants.RESULT_SUCCESS, "查询成功");
+//    }
 
     @PostMapping("/project/regions")
     public RestResponse regions(@RequestBody Region region) {
@@ -75,11 +92,13 @@ public class RegionController {
     }
 
     @PostMapping("/project/areas")
-    public RestResponse areas(@RequestBody AreaCode areaCode) {
-        List<Map<String, Object>> areaCodes = mapper.list("id,name", "area_code", " where parent=" + areaCode.getParent() + " level=3");
-        if (areaCodes.isEmpty()) {
+    public RestResponse areas(@RequestBody Region region) {
+        Region byId = regionService.getById(region.getId());
+        String cityCode = byId.getCityCode();
+        List<Map<String, Object>> area_code = mapper.list("name,code", "area_code", "where parent=" + cityCode);
+        if (area_code.isEmpty()) {
             return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
         }
-        return RestResponse.ok(areaCodes, ApiConstants.RESULT_SUCCESS, "查询成功");
+        return RestResponse.ok(area_code, ApiConstants.RESULT_SUCCESS, "查询成功");
     }
 }