更新

lift-system-service/pom.xml

@@ -36,7 +36,6 @@
             <artifactId>commons-beanutils</artifactId>
             <version>1.9.3</version>
         </dependency>
-
     </dependencies>
 
     <build>

lift-system-service/src/main/java/cn/com/ty/lift/system/region/controller/MtCompanyUserRegionController.java

@@ -1,12 +1,20 @@
 //package cn.com.ty.lift.system.region.controller;
 //
 //
+//import cn.com.ty.lift.common.model.AreaCode;
+//import cn.com.ty.lift.system.region.dao.entity.MtCompanyUserRegion;
 //import cn.com.ty.lift.system.region.service.impl.MtCompanyUserRegionServiceImpl;
 //import cn.com.ty.lift.system.user.service.impl.AreaCodeService;
+//import cn.com.xwy.boot.web.dto.RestResponse;
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 //import lombok.AllArgsConstructor;
+//import org.springframework.web.bind.annotation.PostMapping;
+//import org.springframework.web.bind.annotation.RequestBody;
 //import org.springframework.web.bind.annotation.RequestMapping;
 //import org.springframework.web.bind.annotation.RestController;
 //
+//import java.util.List;
+//
 ///**
 // * <p>
 // * 团队区域表1 前端控制器
@@ -16,24 +24,24 @@
 // * @since 2019-12-09
 // */
 //@RestController
-//@RequestMapping("/system/mt-company-user-region")
-////@AllArgsConstructor
+//@RequestMapping("/mt-company-user-region")
+//@AllArgsConstructor
 //public class MtCompanyUserRegionController {
-////    private final MtCompanyUserRegionServiceImpl mtCompanyUserRegionService;
-////    private final AreaCodeService areaCodeService;
+//    private final MtCompanyUserRegionServiceImpl mtCompanyUserRegionService;
+//    private final AreaCodeService areaCodeService;
 //
-////    @PostMapping("/list")
-////    public RestResponse list(@RequestBody MtCompanyUserRegion mtCompanyUserRegion) {
-////        List<MtCompanyUserRegion> userRegions = mtCompanyUserRegionService.list(new QueryWrapper<MtCompanyUserRegion>()
-////                .eq("mtCompanyId", mtCompanyUserRegion.getMtCompanyId()));
-////        AreaCode provinceCode = areaCodeService.getOne(new QueryWrapper<AreaCode>()
-////                .eq("province_code", mtCompanyUserRegion.getProvinceCode()));
-////        provinceCode.getName();
-////         areaCodeService.list(new QueryWrapper<AreaCode>()
-////                .eq("city_code", mtCompanyUserRegion.getCityCode()));
+//    @PostMapping("/list")
+//    public RestResponse list(@RequestBody MtCompanyUserRegion mtCompanyUserRegion) {
+//        List<MtCompanyUserRegion> userRegions = mtCompanyUserRegionService.list(new QueryWrapper<MtCompanyUserRegion>()
+//                .eq("mtCompanyId", mtCompanyUserRegion.getMtCompanyId()));
+//        AreaCode provinceCode = areaCodeService.getOne(new QueryWrapper<AreaCode>()
+//                .eq("province_code", mtCompanyUserRegion.getProvinceCode()));
+//        provinceCode.getName();
+//         areaCodeService.list(new QueryWrapper<AreaCode>()
+//                .eq("city_code", mtCompanyUserRegion.getCityCode()));
 ////        cityCode.getName();
-////        AreaCode cityCode = areaCodeService.getOne(new QueryWrapper<AreaCode>()
-////                .eq("city_code", mtCompanyUserRegion.getCityCode()));
-////
-////    }
+//        AreaCode cityCode = areaCodeService.getOne(new QueryWrapper<AreaCode>()
+//                .eq("city_code", mtCompanyUserRegion.getCityCode()));
+//
+//    }
 //}

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

@@ -1,95 +1,129 @@
-//package cn.com.ty.lift.system.region.controller;
-//
-//import cn.com.ty.lift.common.constants.ApiConstants;
-//import cn.com.ty.lift.common.model.AreaCode;
-//import cn.com.ty.lift.system.region.dao.entity.Region;
-//import cn.com.ty.lift.system.region.dao.entity.model.RegionReq;
-//import cn.com.ty.lift.system.region.service.impl.RegionServiceImpl;
-//import cn.com.ty.lift.system.user.service.impl.AreaCodeService;
-//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 lombok.AllArgsConstructor;
-//import org.springframework.web.bind.annotation.*;
-//
-//import java.util.List;
-//
-///**
-// * <p>
-// * 区域表 前端控制器
-// * </p>
-// *
-// * @author wang-hai-cheng
-// * @since 2019-12-09
-// */
-//@AllArgsConstructor
-//@RestController
-//@RequestMapping("/region")
-//public class RegionController {
-//    private final RegionServiceImpl regionService;
-//    private final AreaCodeService areaCodeService;
-//
-//    @PostMapping("/list")
-//    public RestResponse list(@RequestBody RegionReq regionReq) {
-//        IPage<Region> page = regionService.page(new Page<>(regionReq.getPageNum(), regionReq.getPageSize()));
-//        if (page.getRecords().isEmpty()) {
+package cn.com.ty.lift.system.region.controller;
+
+import cn.com.ty.lift.common.constants.ApiConstants;
+import cn.com.ty.lift.common.model.AreaCode;
+import cn.com.ty.lift.system.region.dao.entity.Region;
+import cn.com.ty.lift.system.region.dao.entity.model.RegionReq;
+import cn.com.ty.lift.system.region.dao.mapper.CommonMapper;
+import cn.com.ty.lift.system.region.service.impl.RegionServiceImpl;
+import cn.com.ty.lift.system.user.service.impl.AreaCodeService;
+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 lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 区域表 前端控制器
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-09
+ */
+@AllArgsConstructor
+@RestController
+@RequestMapping("/region")
+public class RegionController {
+    private final RegionServiceImpl regionService;
+    private final AreaCodeService areaCodeService;
+    private final CommonMapper mapper;
+
+
+    @PostMapping("/list")
+    public RestResponse list(@RequestBody RegionReq regionReq) {
+        long current = regionReq.getPageNum() * regionReq.getPageSize() - 1;
+        List<Map<String, Object>> list = mapper.list(
+                "r.id, r.area_code, r.province_code, a.name cityName, r.area_name, r.remark, u.name",
+                "region r left join user_info u on r.user_id = u.user_id left join area_code a on r.city_code = a.code left join area_code on r.province_code = a.name",
+                "where r.mt_company_id =" + regionReq.getMtCompanyId());
+        List<Map<String, Object>> projects = mapper.list("region_id,num", "project", "");
+        int count = 0;
+        Integer num = 0;
+        for (int i = 0; i < list.size(); i++) {
+            Object id = list.get(i).get("id");
+            for (int j = 0; j < projects.size(); j++) {
+//                System.out.println("================"+projects.get(i).get("region_id"));
+//                System.out.println("================"+list.get(j).get("id"));
+                if (projects.get(j).get("region_id").equals(id)) {
+                    count += 1;
+                }
+//                num += projects.get(j).get("num");
+                //
+                //
+                //
+                //
+                //
+            }
+            list.get(i).put("project_num", count);
+            count = 0;
+            num = 0;
+        }
+
+        System.out.println(list);
+        //        if (page.getRecords().isEmpty()) {
 //            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
 //        }
 //        return RestResponse.ok(page, ApiConstants.RESULT_SUCCESS, "查询成功");
-//    }
-//
-//    @PostMapping("/add")
-//    public RestResponse add(@RequestBody Region region) {
-//        if (regionService.save(region)) {
-//            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "新增成功");
-//        }
-//        return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "新增失败");
-//    }
-//
-//    @PostMapping("/delete")
-//    public RestResponse delete(@RequestBody Region region) {
-//        if (regionService.removeById(region.getId())) {
-//            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "删除成功");
-//        }
-//        return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "删除失败");
-//    }
-//
-//    @PostMapping("/update")
-//    public RestResponse update(@RequestBody Region region) {
-//        if (regionService.updateById(region)) {
-//            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "修改成功");
-//        }
-//        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("/project/regions")
-//    public RestResponse regions(@RequestBody Region region) {
-//        List<Region> regions = regionService.list(new QueryWrapper<Region>()
-//                .eq("mt_company_id", region.getMtCompanyId()));
-//        if (regions.isEmpty()) {
-//            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
-//        }
-//        return RestResponse.ok(regions, ApiConstants.RESULT_SUCCESS, "查询成功");
-//    }
-//
-//    @PostMapping("/project/areas")
-//    public RestResponse areas(@RequestBody AreaCode areaCode) {
-//        List<AreaCode> areaCodes = areaCodeService.list(new QueryWrapper<AreaCode>()
-//                .eq("parent", areaCode.getParent())
-//                .eq("level", 3));
-//        if (areaCodes.isEmpty()) {
-//            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
-//        }
-//        return RestResponse.ok(areaCodes, ApiConstants.RESULT_SUCCESS, "查询成功");
-//    }
-//}
+        return RestResponse.ok(null, "", "");
+    }
+
+    @PostMapping("/add")
+    public RestResponse add(@RequestBody Region region) {
+        if (regionService.save(region)) {
+            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "新增成功");
+        }
+        return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "新增失败");
+    }
+
+    @PostMapping("/delete")
+    public RestResponse delete(@RequestBody Region region) {
+        if (regionService.removeById(region.getId())) {
+            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "删除成功");
+        }
+        return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "删除失败");
+    }
+
+    @PostMapping("/update")
+    public RestResponse update(@RequestBody Region region) {
+        if (regionService.updateById(region)) {
+            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "修改成功");
+        }
+        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("/project/regions")
+    public RestResponse regions(@RequestBody Region region) {
+        List<Region> regions = regionService.list(new QueryWrapper<Region>()
+                .eq("mt_company_id", region.getMtCompanyId()));
+        if (regions.isEmpty()) {
+            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
+        }
+        return RestResponse.ok(regions, ApiConstants.RESULT_SUCCESS, "查询成功");
+    }
+
+    @PostMapping("/project/areas")
+    public RestResponse areas(@RequestBody AreaCode areaCode) {
+        List<AreaCode> areaCodes = areaCodeService.list(new QueryWrapper<AreaCode>()
+                .eq("parent", areaCode.getParent())
+                .eq("level", 3));
+        if (areaCodes.isEmpty()) {
+            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
+        }
+        return RestResponse.ok(areaCodes, ApiConstants.RESULT_SUCCESS, "查询成功");
+    }
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/region/dao/entity/MtCompanyUserRegion.java

@@ -1,53 +1,53 @@
-//package cn.com.ty.lift.system.region.dao.entity;
-//
-//import com.baomidou.mybatisplus.annotation.IdType;
-//import com.baomidou.mybatisplus.annotation.TableField;
-//import com.baomidou.mybatisplus.annotation.TableId;
-//import lombok.Data;
-//import lombok.EqualsAndHashCode;
-//import lombok.experimental.Accessors;
-//
-//import java.io.Serializable;
-//
-///**
-// * <p>
-// * 团队区域表1
-// * </p>
-// *
-// * @author wang-hai-cheng
-// * @since 2019-12-09
-// */
-//@Data
-//@EqualsAndHashCode(callSuper = false)
-//@Accessors(chain = true)
-//public class MtCompanyUserRegion implements Serializable {
-//
-//    private static final long serialVersionUID = 1L;
-//
-//    /**
-//     * 团队ID
-//     */
-//    @TableField("mt_company_id")
-//    private Long mtCompanyId;
-//
-//    /**
-//     * 用户ID
-//     */
-//    @TableField("user_id")
-//    private Long userId;
-//
-//    /**
-//     * 省编号
-//     */
-//    @TableField("province_code")
-//    private String provinceCode;
-//
-//    /**
-//     * 市编号
-//     */
-//    @TableField("city_code")
-//    private String cityCode;
-//
-//    @TableId(value = "id", type = IdType.ID_WORKER)
-//    private Integer id;
-//}
+package cn.com.ty.lift.system.region.dao.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 团队区域表1
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class MtCompanyUserRegion implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 团队ID
+     */
+    @TableField("mt_company_id")
+    private Long mtCompanyId;
+
+    /**
+     * 用户ID
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 省编号
+     */
+    @TableField("province_code")
+    private String provinceCode;
+
+    /**
+     * 市编号
+     */
+    @TableField("city_code")
+    private String cityCode;
+
+    @TableId(value = "id", type = IdType.ID_WORKER)
+    private Integer id;
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/region/dao/entity/Region.java

@@ -1,79 +1,79 @@
-//package cn.com.ty.lift.system.region.dao.entity;
-//
-//import com.baomidou.mybatisplus.annotation.IdType;
-//import com.baomidou.mybatisplus.annotation.TableField;
-//import com.baomidou.mybatisplus.annotation.TableId;
-//import lombok.Data;
-//import lombok.EqualsAndHashCode;
-//import lombok.experimental.Accessors;
-//
-//import java.io.Serializable;
-//
-///**
-// * <p>
-// * 区域表
-// * </p>
-// *
-// * @author wang-hai-cheng
-// * @since 2019-12-09
-// */
-//@Data
-//@EqualsAndHashCode(callSuper = false)
-//@Accessors(chain = true)
-//public class Region implements Serializable {
-//
-//    private static final long serialVersionUID = 1L;
-//
-//    @TableId(value = "id", type = IdType.ID_WORKER)
-//    private Long id;
-//
-//    /**
-//     * 团队id
-//     */
-//    @TableField("mt_company_id")
-//    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 Long clerk;
-//
-//    /**
-//     * 备注
-//     */
-//    @TableField("remark")
-//    private String remark;
-//
-//
-//}
+package cn.com.ty.lift.system.region.dao.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 区域表
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class Region implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.ID_WORKER)
+    private Long id;
+
+    /**
+     * 团队id
+     */
+    @TableField("mt_company_id")
+    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 Long clerk;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+}

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

@@ -1,82 +1,82 @@
-//package cn.com.ty.lift.system.region.dao.entity.model;
-//
-//import cn.com.ty.lift.system.region.dao.entity.Region;
-//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 com.baomidou.mybatisplus.core.metadata.IPage;
-//import lombok.Data;
-//import lombok.EqualsAndHashCode;
-//import lombok.experimental.Accessors;
-//
-//import java.io.Serializable;
-//
-///**
-// * <p>
-// * 区域表
-// * </p>
-// *
-// * @author wang-hai-cheng
-// * @since 2019-12-09
-// */
-//@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")
-//    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 Long clerk;
-//
-//    /**
-//     * 备注
-//     */
-//    @TableField("remark")
-//    private String remark;
-//
-//}
-//
+package cn.com.ty.lift.system.region.dao.entity.model;
+
+import cn.com.ty.lift.system.region.dao.entity.Region;
+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 com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 区域表
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-09
+ */
+@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")
+    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 Long clerk;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+}
+

lift-system-service/src/main/java/cn/com/ty/lift/system/region/dao/mapper/CommonMapper.java

@@ -1,16 +1,16 @@
-//package cn.com.ty.lift.system.region.dao.mapper;
-//
-//import org.apache.ibatis.annotations.Mapper;
-//import org.apache.ibatis.annotations.Select;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-//@Mapper
-//public interface CommonMapper {
-//    @Select("select ${fields} from ${tables} ${conditions}")
-//    List<Map<String, Object>> list(String fields, String tables, String conditions);
-//
-//    @Select("select ${fields} from ${tables} where ${conditions}")
-//    Map<String, Object> one(String fields, String tables, String conditions);
-//}
+package cn.com.ty.lift.system.region.dao.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface CommonMapper {
+    @Select("select ${fields} from ${tables} ${conditions}")
+    List<Map<String, Object>> list(String fields, String tables, String conditions);
+
+    @Select("select ${fields} from ${tables} ${conditions}")
+    Map<String, Object> one(String fields, String tables, String conditions);
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/region/dao/mapper/MtCompanyUserRegionMapper.java

@@ -1,16 +1,16 @@
-//package cn.com.ty.lift.system.region.dao.mapper;
-//
-//import cn.com.ty.lift.system.region.dao.entity.MtCompanyUserRegion;
-//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-//
-///**
-// * <p>
-// * 团队区域表1 Mapper 接口
-// * </p>
-// *
-// * @author wang-hai-cheng
-// * @since 2019-12-09
-// */
-//public interface MtCompanyUserRegionMapper extends BaseMapper<MtCompanyUserRegion> {
-//
-//}
+package cn.com.ty.lift.system.region.dao.mapper;
+
+import cn.com.ty.lift.system.region.dao.entity.MtCompanyUserRegion;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 团队区域表1 Mapper 接口
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-09
+ */
+public interface MtCompanyUserRegionMapper extends BaseMapper<MtCompanyUserRegion> {
+
+}

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

@@ -1,15 +1,15 @@
-//package cn.com.ty.lift.system.region.dao.mapper;
-//
-//import cn.com.ty.lift.system.region.dao.entity.Region;
-//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-///**
-// * <p>
-// * 区域表 Mapper 接口
-// * </p>
-// *
-// * @author wang-hai-cheng
-// * @since 2019-12-09
-// */
-//public interface RegionMapper extends BaseMapper<Region> {
-//
-//}
+package cn.com.ty.lift.system.region.dao.mapper;
+
+import cn.com.ty.lift.system.region.dao.entity.Region;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+/**
+ * <p>
+ * 区域表 Mapper 接口
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-09
+ */
+public interface RegionMapper extends BaseMapper<Region> {
+
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/region/service/MtCompanyUserRegionService.java

@@ -1,16 +1,16 @@
-//package cn.com.ty.lift.system.region.service;
-//
-//import cn.com.ty.lift.system.region.dao.entity.MtCompanyUserRegion;
-//import com.baomidou.mybatisplus.extension.service.IService;
-//
-///**
-// * <p>
-// * 团队区域表1 服务类
-// * </p>
-// *
-// * @author wang-hai-cheng
-// * @since 2019-12-09
-// */
-//public interface MtCompanyUserRegionService extends IService<MtCompanyUserRegion> {
-//
-//}
+package cn.com.ty.lift.system.region.service;
+
+import cn.com.ty.lift.system.region.dao.entity.MtCompanyUserRegion;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 团队区域表1 服务类
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-09
+ */
+public interface MtCompanyUserRegionService extends IService<MtCompanyUserRegion> {
+
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/region/service/RegionService.java

@@ -1,16 +1,16 @@
-//package cn.com.ty.lift.system.region.service;
-//
-//import cn.com.ty.lift.system.region.dao.entity.Region;
-//import com.baomidou.mybatisplus.extension.service.IService;
-//
-///**
-// * <p>
-// * 区域表 服务类
-// * </p>
-// *
-// * @author wang-hai-cheng
-// * @since 2019-12-09
-// */
-//public interface RegionService extends IService<Region> {
-//
-//}
+package cn.com.ty.lift.system.region.service;
+
+import cn.com.ty.lift.system.region.dao.entity.Region;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 区域表 服务类
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-09
+ */
+public interface RegionService extends IService<Region> {
+
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/region/service/impl/MtCompanyUserRegionServiceImpl.java

@@ -1,20 +1,20 @@
-//package cn.com.ty.lift.system.region.service.impl;
-//
-//import cn.com.ty.lift.system.region.dao.entity.MtCompanyUserRegion;
-//import cn.com.ty.lift.system.region.dao.mapper.MtCompanyUserRegionMapper;
-//import cn.com.ty.lift.system.region.service.MtCompanyUserRegionService;
-//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-//import org.springframework.stereotype.Service;
-//
-///**
-// * <p>
-// * 团队区域表1 服务实现类
-// * </p>
-// *
-// * @author wang-hai-cheng
-// * @since 2019-12-09
-// */
-//@Service
-//public class MtCompanyUserRegionServiceImpl extends ServiceImpl<MtCompanyUserRegionMapper, MtCompanyUserRegion> implements MtCompanyUserRegionService {
-//
-//}
+package cn.com.ty.lift.system.region.service.impl;
+
+import cn.com.ty.lift.system.region.dao.entity.MtCompanyUserRegion;
+import cn.com.ty.lift.system.region.dao.mapper.MtCompanyUserRegionMapper;
+import cn.com.ty.lift.system.region.service.MtCompanyUserRegionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 团队区域表1 服务实现类
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-09
+ */
+@Service
+public class MtCompanyUserRegionServiceImpl extends ServiceImpl<MtCompanyUserRegionMapper, MtCompanyUserRegion> implements MtCompanyUserRegionService {
+
+}

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

@@ -1,20 +1,20 @@
-//package cn.com.ty.lift.system.region.service.impl;
-//
-//import cn.com.ty.lift.system.region.dao.entity.Region;
-//import cn.com.ty.lift.system.region.dao.mapper.RegionMapper;
-//import cn.com.ty.lift.system.region.service.RegionService;
-//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-//import org.springframework.stereotype.Service;
-//
-///**
-// * <p>
-// * 区域表 服务实现类
-// * </p>
-// *
-// * @author wang-hai-cheng
-// * @since 2019-12-09
-// */
-//@Service
-//public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> implements RegionService {
-//
-//}
+package cn.com.ty.lift.system.region.service.impl;
+
+import cn.com.ty.lift.system.region.dao.entity.Region;
+import cn.com.ty.lift.system.region.dao.mapper.RegionMapper;
+import cn.com.ty.lift.system.region.service.RegionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 区域表 服务实现类
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-09
+ */
+@Service
+public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> implements RegionService {
+
+}