查看评价，优化代码

lift-business-service/src/main/java/cn/com/ty/lift/business/evaluation/controller/EvaluationController.java

@@ -4,6 +4,8 @@ package cn.com.ty.lift.business.evaluation.controller;
 import cn.com.ty.lift.business.evaluation.dao.entity.Evaluation;
 import cn.com.ty.lift.business.evaluation.service.EvaluationService;
 import cn.com.xwy.boot.web.dto.RestResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -20,26 +22,39 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/evaluation")
+@AllArgsConstructor
 public class EvaluationController {
 
-    @Autowired
-    private EvaluationService evaluationService;
+    private final EvaluationService evaluationService;
 
     /**
-     * @param
-     * @return
+     * @param entity 维保，急修记录
+     * @return RestResponse
      * @description 保存评价信息
      * @date 2019-12-31 15:46
      */
     @PostMapping("/save")
     public RestResponse save(@RequestBody Evaluation entity) {
-        if(null == entity){
-            return RestResponse.failParam();
-        }
-        boolean result = evaluationService.save(entity);
-        if(result){
-            return RestResponse.success(result);
+        if (evaluationService.save(entity)) {
+            return RestResponse.success(null, "成功");
         }
         return RestResponse.fail();
     }
+
+    /**
+     * 查看评价信息
+     *
+     * @param entity 维保，急修记录id
+     * @return RestResponse
+     * @date 2020-01-11 09:51
+     */
+    @PostMapping
+    public RestResponse evaluation(@RequestBody Evaluation entity) {
+        Evaluation one = evaluationService.getOne(new QueryWrapper<Evaluation>()
+                .eq(entity.getRecordId() != null, "record_id", entity.getRecordId()));
+        if (null == one) {
+            return RestResponse.success();
+        }
+        return RestResponse.success(one);
+    }
 }

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

@@ -45,7 +45,7 @@ public class PropertyCompanyController {
     public RestResponse propertyCompany(@PathVariable Long id) {
         PropertyCompany byId = propertyCompanyService.getById(id);
         if (byId == null) {
-            return RestResponse.failParam();
+            return RestResponse.success();
         }
         return RestResponse.success(byId);
     }

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

@@ -156,62 +156,4 @@ public class OrganizationService {
         }
         return RestResponse.success(ps,"成功");
     }
-
-
-//    public Map<String, List> organizationTree1(Long mtCompanyId) {
-//        Map<String, List> ps = new HashMap<>();
-//        Map<String, List> cs = new HashMap<>();
-//        Map<String, List> ds = new HashMap<>();
-//
-//        List<Project> projects = projectService.list(new QueryWrapper<Project>()
-//                .select("id", "project_name", "province", "city", "district", "num")
-//                .eq("mt_company_id", mtCompanyId)
-//        );
-//
-//        for (Project project : projects) {
-//            if (project.getProjectName() == null || project.getDistrict() == null || project.getCity() == null || project.getProvince() == null)
-//                continue;
-//
-//            String district = project.getDistrict();
-//            String city = project.getCity();
-//            String province = project.getProvince();
-//
-//            //获取区列表和区下的项目
-//            if (!ds.containsKey(district)) {
-//                ds.put(district, new ArrayList());
-//            }
-//            if (ds.get(district) instanceof ArrayList) {
-//                ds.get(district).add(project);
-//            }
-//
-//            //获取市列表
-//            if (!cs.containsKey(city)) {
-//                cs.put(city, new ArrayList());
-//            }
-//
-//            //获取省列表
-//            if (!ps.containsKey(province)) {
-//                ps.put(province, new ArrayList());
-//            }
-//        }
-//
-//        for (Map.Entry<String, List> entry : ds.entrySet()) {
-//            for (Project project : projects) {
-//                if (entry.getKey().equals(project.getDistrict())) {
-//                    cs.get(project.getCity()).add(entry);
-//                    break;
-//                }
-//            }
-//        }
-//
-//        for (Map.Entry<String, List> entry : cs.entrySet()) {
-//            for (Project project : projects) {
-//                if (entry.getKey().equals(project.getCity())) {
-//                    ps.get(project.getProvince()).add(entry);
-//                    break;
-//                }
-//            }
-//        }
-//        return ps;
-//    }
 }

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

@@ -78,8 +78,8 @@ public class RegionController {
     }
 
     /**
-     * @param
-     * @return
+     * @param region 区域id
+     * @return RestResponse
      * @description 项目模块，查询区列表
      * @date 2019/12/17 10:34
      */

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/dao/entity/model/RegionReq.java

@@ -1,15 +1,13 @@
 package cn.com.ty.lift.enterprise.region.dao.entity.model;
 
-import cn.com.xwy.boot.controller.BaseRequestModel;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import cn.com.ty.lift.enterprise.region.dao.entity.Region;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * <p>
@@ -22,60 +20,9 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class RegionReq extends BaseRequestModel implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.ID_WORKER)
-    private Long id;
-
-    /**
-     * 团队id
-     */
-    @TableField("mt_company_id")
+public class RegionReq extends Region implements Serializable{
+    private Long pageNum;
+    private Long pageSize;
     private Long mtCompanyId;
-
-    /**
-     * 区域代号
-     */
-    @TableField("area_code")
-    private String areaCode;
-
-    /**
-     * 省级行政代码
-     */
-    @TableField("province_code")
-    private String provinceCode;
-
-    /**
-     * 城市区域代码
-     */
-    @TableField("city_code")
-    private String cityCode;
-
-    /**
-     * 区域名称
-     */
-    @TableField("area_name")
-    private String areaName;
-
-    /**
-     * 用户id
-     */
-    @TableField("user_id")
-    private Long userId;
-
-    /**
-     * 文员id
-     */
-    @TableField("clerk")
-    private String clerk;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
 }
 

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/dao/mapper/RegionMapper.java

@@ -21,8 +21,8 @@ public interface RegionMapper extends BaseMapper<Region> {
     @Select("select city_code cityCode, province_code provinceCode from region where id = #{id}")
     List<Map<String, Object>> selectProjectRegions(@Param("id") Long id);
 
-    @Select("select r.id, r.area_code areaCode, r.province_code provinceCode, r.city_code cityCode, r.area_name areaName, r.remark, u.name from region r left join user_info u on r.user_id = u.user_id where r.mt_company_id = ${mtCompanyId} limit ${pageNum},${pageSize}")
-    List<Map<String, Object>> selectRegions(@Param("mtCompanyId") Long mtCompanyId, @Param("pageNum") Long pageNum, @Param("pageSize") Long pageSize);
+    @Select("select user_id userId,name from user_info")
+    List<Map<String,Object>> selectUserInfo();
 
     @Select("select region_id regionId,num from project")
     List<Map<String, Object>> selectProjects();

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/service/impl/RegionServiceImpl.java

@@ -7,6 +7,7 @@ import cn.com.ty.lift.enterprise.region.dao.mapper.RegionMapper;
 import cn.com.ty.lift.enterprise.region.service.RegionService;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
@@ -31,30 +32,45 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
 
     //分页区域列表
     public RestResponse regions(RegionReq req) {
-        long pageNum = (req.getPageNum() - 1) * req.getPageSize();
-        long pageSize = req.getPageSize();
-        Page<Map<String, Object>> page = new Page<>(req.getPageNum(), pageSize);
         //获取维保团队的区域列表
-        List<Map<String, Object>> regions = this.getBaseMapper().selectRegions(req.getMtCompanyId(), pageNum, pageSize);
+        System.out.println(req);
+        System.out.println(this.page(new Page<>(req.getPageNum(), req.getPageSize())).getRecords());
+        IPage<Map<String, Object>> regions = this.pageMaps(new Page<>(req.getPageNum(), req.getPageSize()),
+                new QueryWrapper<Region>()
+                .eq("mt_company_id", req.getMtCompanyId()));
+
+        List<Map<String, Object>> records = regions.getRecords();
         //如果没有区域
-        if (regions.isEmpty()) {
+        if (records.isEmpty()) {
             return RestResponse.success();
         }
-        List<Map<String, Object>> projects = this.getBaseMapper().selectProjects();
-        List<Map<String, Object>> areaCodes = this.getBaseMapper().selectAreaCodes();
+        List<Map<String, Object>> projects = baseMapper.selectProjects();
+        List<Map<String, Object>> areaCodes = baseMapper.selectAreaCodes();
         int projectNum = 0;
-        Integer num = 0;
+        int num = 0;
         //遍历区域列表
-        if (regions.isEmpty()) {
+        if (records.isEmpty()) {
             return RestResponse.success();
         }
-        for (Map<String, Object> region : regions) {
-            //遍历省市列表，将省市的id转化为name
+        for (Map<String, Object> region : records) {
+            //遍历用户列表，将user_id替换为name
+            List<Map<String, Object>> userInfos = baseMapper.selectUserInfo();
+            if (userInfos.isEmpty()) {
+                region.put("name", "无");
+            } else {
+                userInfos.forEach(userInfo -> {
+                    if (null != userInfo.get("id") && userInfo.get("id").equals(region.get("userId"))) {
+                        region.put("name", userInfo.get("name"));
+                    }
+                });
+            }
+
+            //遍历省市列表，将省市的code转化为name
             for (Map<String, Object> area : areaCodes) {
-                if (region.get("provinceCode").equals(area.get("code"))) {
+                if (null != region.get("provinceCode") && region.get("provinceCode").equals(area.get("code"))) {
                     region.put("provinceName", area.get("name"));
                 }
-                if (region.get("cityCode").equals(area.get("code"))) {
+                if (null != region.get("cityCode") && region.get("cityCode").equals(area.get("code"))) {
                     region.put("cityName", area.get("name"));
                 }
             }
@@ -62,9 +78,14 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
             //遍历项目列表，获取区域下的项目个数和区域下的总电梯数
             Object id = region.get("id");
             for (Map<String, Object> project : projects) {
-                if (project.get("regionId").equals(id)) {
+                if (null != project.get("regionId")) {
+                    if (project.get("regionId").equals(id)) {
+                        projectNum += 1;
+                        num += (Integer) project.get("num");
+                    }
+                } else {
                     projectNum += 1;
-                    num += (Integer) project.get("num");
+                    num = 0;
                 }
             }
             region.put("projectNum", projectNum);
@@ -72,19 +93,13 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
             projectNum = 0;
             num = 0;
         }
-        //设置分页对象的属性
-        int count = this.getBaseMapper().selectCount(new QueryWrapper<Region>()
-                .eq("mt_company_id", req.getMtCompanyId()));
-        page.setRecords(regions);
-        page.setTotal(count);
-        page.setPages(count / pageSize);
-        return RestResponse.success(page, "成功");
+        return RestResponse.success(regions, "成功");
     }
 
     //删除区域，如果区域下没有关联项目
     public RestResponse delete(Region region) {
-        Map<String, Object> regionId = this.baseMapper.selectProjectCount(region.getId());
-        if (regionId.get("count").equals(0L)) {
+        Map<String, Object> projectCount = baseMapper.selectProjectCount(region.getId());
+        if (null != projectCount.get("count") && projectCount.get("count").equals(0L)) {
             if (this.removeById(region.getId())) {
                 return RestResponse.success(null, "成功");
             }
@@ -102,11 +117,11 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
         for (Map<String, Object> region : regions) {
             for (AreaCode area : areas) {
                 //如果区域的城市code等于区中的code，put名字到区域中
-                if (region.get("cityCode").equals(area.getCode())) {
+                if (null != region.get("cityCode") && region.get("cityCode").equals(area.getCode())) {
                     region.put("city", area.getName());
                 }
                 //如果区域的省code等于区中的code，put名字到区域中
-                if (region.get("provinceCode").equals(area.getCode())) {
+                if (null != region.get("provinceCode") && region.get("provinceCode").equals(area.getCode())) {
                     region.put("province", area.getName());
                 }
             }
@@ -120,19 +135,19 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
         if (region == null) {
             return RestResponse.success();
         }
-        HashMap<String, Object> data = new HashMap<>();
-        List<Map<String, Object>> regionUser = this.baseMapper.selectRegionMember(region.getUserId().toString());
-        if (region.getClerk() != null && !region.getClerk().equals("-1")) {
-            List<Map<String, Object>> regionClerk = this.baseMapper.selectRegionMember(region.getClerk());
-            data.put("regionClerk", regionClerk);
+        HashMap<String, Object> result = new HashMap<>();
+        List<Map<String, Object>> regionUser = baseMapper.selectRegionMember(region.getUserId().toString());
+        if (null != region.getClerk() && !region.getClerk().equals("-1")) {
+            List<Map<String, Object>> regionClerk = baseMapper.selectRegionMember(region.getClerk());
+            result.put("regionClerk", regionClerk);
         } else {
-            data.put("regionClerk", null);
+            result.put("regionClerk", null);
         }
-        if (regionUser.get(0) == null) {
-            data.put("regionUser", regionUser);
+        if (regionUser.isEmpty()) {
+            result.put("regionUser", null);
         } else {
-            data.put("regionUser", regionUser.get(0).get("name"));
+            result.put("regionUser", regionUser.get(0).get("name"));
         }
-        return RestResponse.success(data, "查询成功");
+        return RestResponse.success(result, "查询成功");
     }
 }