区域文员查询更改

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/option/controller/MaintenanceOptionController.java

@@ -1,9 +1,23 @@
 package cn.com.ty.lift.enterprise.option.controller;
 
 
+import cn.com.ty.lift.common.constants.ApiConstants;
+import cn.com.ty.lift.enterprise.option.dao.entity.MaintenanceOption;
+import cn.com.ty.lift.enterprise.option.dao.entity.model.OptionReq;
+import cn.com.ty.lift.enterprise.option.service.impl.MaintenanceOptionServiceImpl;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
+
 /**
  * <p>
  * 保养项目 前端控制器
@@ -13,7 +27,80 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2019-12-18
  */
 @RestController
+@AllArgsConstructor
 @RequestMapping("/maintenance-option")
 public class MaintenanceOptionController {
 
-}
+    private final MaintenanceOptionServiceImpl optionService;
+
+    /**
+     * @param
+     * @return
+     * @description 分页获取维保项列表
+     * @date 2019/12/19 9:21
+     */
+    @PostMapping("/list")
+    public RestResponse list(@RequestBody OptionReq req, HttpServletRequest request) {
+        IPage page = optionService.page(
+                new Page<>(req.getPageNum(), req.getPageSize()),
+                new QueryWrapper<MaintenanceOption>()
+                        .eq(req.getLiftType() != null, "lift_type", req.getLiftType())
+                        .eq(req.getType() != null, "type", req.getType()));
+        if (page.getRecords().isEmpty()) {
+            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
+        }
+        return RestResponse.ok(page, ApiConstants.RESULT_SUCCESS, "成功");
+    }
+
+    /**
+     * @param
+     * @return
+     * @description 新增维保项
+     * @date 2019/12/19 9:20
+     */
+    @PostMapping("/add")
+    public RestResponse add(@RequestBody MaintenanceOption option) {
+        if (optionService.save(option)) {
+            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "成功");
+        }
+        return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "失败");
+    }
+
+    /**
+     * @param
+     * @return
+     * @description 更新维保项
+     * @date 2019/12/19 10:03
+     */
+    @PostMapping("/modify")
+    public RestResponse modify(@RequestBody MaintenanceOption option) {
+        MaintenanceOption byId = optionService.getById(option.getId());
+        if (byId == null) {
+            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
+        }
+        if (byId.getEdit() == 1) {
+            if (optionService.updateById(option)) {
+                return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "成功");
+            }
+        }
+        return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "失败");
+    }
+
+    /**
+     * @param
+     * @return
+     * @description 判断是否可以编辑，可以编辑的维保项才可以删除
+     * @date 2019/12/19 9:20
+     */
+    @PostMapping("/delete")
+    public RestResponse delete(@RequestBody MaintenanceOption option) {
+        MaintenanceOption byId = optionService.getById(option.getId());
+        if (byId == null) {
+            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
+        }
+        if (byId.getEdit() == 1 && optionService.removeById(option.getId())) {
+            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "成功");
+        }
+        return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "失败");
+    }
+}

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/option/dao/entity/MaintenanceOption.java

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.enterprise.option.dao.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
@@ -26,14 +27,14 @@ public class MaintenanceOption implements Serializable {
     /**
      * 保养项目ID
      */
-    @TableId("id")
-    private Integer id;
+    @TableId(value = "id",type = IdType.ID_WORKER)
+    private Long id;
 
     /**
      * 保养项目
      */
-    @TableField("option")
-    private String option;
+    @TableField("item")
+    private String item;
 
     /**
      * 保养内容
@@ -71,5 +72,9 @@ public class MaintenanceOption implements Serializable {
     @TableField("signage")
     private String signage;
 
-
+    /**
+     * 是否可编辑
+     */
+    @TableField("edit")
+    private Integer edit;
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/option/dao/entity/model/OptionReq.java

@@ -0,0 +1,10 @@
+package cn.com.ty.lift.enterprise.option.dao.entity.model;
+
+import cn.com.ty.lift.enterprise.option.dao.entity.MaintenanceOption;
+import lombok.Data;
+
+@Data
+public class OptionReq extends MaintenanceOption {
+    private Integer pageNum;
+    private Integer pageSize;
+}

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

@@ -67,7 +67,7 @@ public class Region implements Serializable {
      * 文员id
      */
     @TableField("clerk")
-    private Long clerk;
+    private String clerk;
 
     /**
      * 备注

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

@@ -69,13 +69,7 @@ public class RegionReq extends BaseRequestModel implements Serializable {
      * 文员id
      */
     @TableField("clerk")
-    private Long clerk;
-
-    /**
-     * 文员列表id
-     */
-    @TableField(exist = false)
-    private List<Long> clerks;
+    private String clerk;
 
     /**
      * 备注

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

@@ -32,9 +32,7 @@ public interface RegionMapper extends BaseMapper<Region> {
     @Select("select code,name from area_code")
     List<Map<String, Object>> selectAreaCodes();
 
-    @Select("select  u.name from region r left join user_info u on u.user_id = r.user_id where r.user_id =  ${userId}  and r.id = ${regionId}")
-    Map<String, Object> selectRegionUser(@Param("userId") Long userId, @Param("regionId") Long regionId);
+    @Select("select user_id userId,name from user_info where user_id in (${clerks})")
+    List<Map<String, Object>> selectRegionMember(@Param("clerks") String clerk);
 
-    @Select("select  u.name from region r left join user_info u on u.user_id = r.clerk where r.clerk =  ${clerk}  and r.id = ${regionId}")
-    Map<String, Object> selectRegionClerk(@Param("clerk") Long clerk, @Param("regionId") Long regionId);
 }

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

@@ -118,10 +118,17 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
     //项目模块用，查询区域下的成员列表
     public RestResponse selectRegionUser(Region region) {
         region = this.getById(region.getId());
-        Map<String, Object> regionUser = this.baseMapper.selectRegionUser(region.getUserId(), region.getId());
-        Map<String, Object> regionClerk = this.baseMapper.selectRegionClerk(region.getClerk(), region.getId());
+        if (region == null) {
+            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无此区域");
+        }
         HashMap<String, Object> data = new HashMap<>();
-        data.put("regionUser", regionUser);
+        List<Map<String, Object>> regionUser = this.baseMapper.selectRegionMember(region.getUserId().toString());
+        List<Map<String, Object>> regionClerk = this.baseMapper.selectRegionMember(region.getClerk());
+        if (regionUser.get(1) == null) {
+            data.put("regionUser", regionUser);
+        } else {
+            data.put("regionUser", regionUser.get(1).get("name"));
+        }
         data.put("regionClerk", regionClerk);
         return RestResponse.ok(data, ApiConstants.RESULT_SUCCESS, "查询成功");
     }