工位管理

src/main/java/com/glxp/api/controller/basic/BasicCollectPointCategoryController.java

@@ -0,0 +1,82 @@
+package com.glxp.api.controller.basic;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.basic.BasicCollectPointCategory;
+import com.glxp.api.req.basic.BasicCollectgoryRequest;
+import com.glxp.api.req.basic.BasicProductTypeRequest;
+import com.glxp.api.res.basic.BasicCollectGoryResponse;
+import com.glxp.api.res.basic.BasicProductCategoryTypeResponse;
+import com.glxp.api.service.basic.BasicCollectPointCategoryService;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 工位关联表(BasicCollectPointCategory)表控制层
+ *
+ * @author makejava
+ * @since 2024-08-14 10:52:11
+ */
+@RestController
+public class BasicCollectPointCategoryController extends BaseController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private BasicCollectPointCategoryService basicCollectPointCategoryService;
+
+
+    @GetMapping("udiwms/basic/collectPoint/category/getTree")
+    public BaseResponse getTree(BasicCollectgoryRequest request) {
+        List<BasicCollectGoryResponse> treeList = basicCollectPointCategoryService.getTreeList(request);
+        return ResultVOUtils.success(treeList);
+    }
+
+
+    @PostMapping("udiwms/basic/collectPoint/category/addTree")
+    public BaseResponse addTree(@RequestBody BasicCollectgoryRequest request) {
+
+        if (StrUtil.isEmpty(request.getName())) {
+            return ResultVOUtils.error(500, "名字不能为空！");
+        }
+
+        Boolean falg = basicCollectPointCategoryService.checkName(request, 1);
+        if (falg == false) {
+            return ResultVOUtils.error(500, "名字重复！");
+        }
+
+        falg = basicCollectPointCategoryService.saveTree(request);
+        if (!falg) {
+            return ResultVOUtils.error(500, "增加失败！");
+        }
+        return ResultVOUtils.success();
+
+    }
+
+
+
+    @PostMapping("udiwms/basic/collectPoint/category/deleteTree")
+    public BaseResponse addTree(@RequestBody BasicCollectPointCategory basicCollectPointCategory) {
+        QueryWrapper wrapper = new QueryWrapper();
+        wrapper.eq("code",basicCollectPointCategory.getCode());
+        boolean remove = basicCollectPointCategoryService.remove(wrapper);
+        if (!remove){
+            return ResultVOUtils.error("删除失败");
+        }
+        return ResultVOUtils.success();
+
+    }
+
+
+
+
+}
+

src/main/java/com/glxp/api/controller/basic/BasicCollectPointController.java

@@ -0,0 +1,137 @@
+package com.glxp.api.controller.basic;
+
+import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.auth.SysWorkplace;
+import com.glxp.api.entity.auth.WarehouseUserEntity;
+import com.glxp.api.entity.basic.BasicCollectPointEntity;
+import com.glxp.api.entity.basic.BasicCollectUserEntity;
+import com.glxp.api.req.auth.FilterInvLinkDataRequest;
+import com.glxp.api.req.auth.SysWorkplaceRequest;
+import com.glxp.api.req.basic.BasicCollectRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.auth.DeptUserResponse;
+import com.glxp.api.res.inout.ReceiveResponse;
+import com.glxp.api.service.auth.AuthAdminService;
+import com.glxp.api.service.auth.DeptService;
+import com.glxp.api.service.auth.DeptUserService;
+import com.glxp.api.service.auth.WarehouseUserService;
+import com.glxp.api.service.basic.BasicCollectPointService;
+import com.glxp.api.service.basic.BasicCollectUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.weaver.ast.Var;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author : zhuzhu
+ * @date : 2024/8/13 9:50
+ * @modyified By :
+ */
+@Slf4j
+@RestController
+public class BasicCollectPointController extends BaseController {
+
+
+    @Resource
+    private BasicCollectPointService basicCollectPointService;
+
+    @Resource
+    private BasicCollectUserService basicCollectUserService;
+
+
+
+    @Resource
+    private WarehouseUserService warehouseUserService;
+
+    @Resource
+    private AuthAdminService authAdminService;
+
+
+
+
+
+
+    @GetMapping("/udiwms/basic/collectPoints/getList")
+    public BaseResponse page(BasicCollectRequest request) {
+        List<BasicCollectPointEntity> page = basicCollectPointService.filterList(request);
+        PageInfo<BasicCollectPointEntity> pageInfo = new PageInfo<>(page);
+        PageSimpleResponse<BasicCollectPointEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(page);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    @PostMapping("/udiwms/basic/collectPoints/addCollectPoint")
+    public BaseResponse addCollectPoint(@RequestBody BasicCollectPointEntity entity) {
+        entity.setId(IdUtil.getSnowflakeNextId());
+        entity.setCreateTime(new Date());
+        entity.setUpdateTime(new Date());
+        entity.setUpdateUser(this.getUserId() + "");
+        entity.setCreateUser(this.getUserId() + "");
+        boolean save = basicCollectPointService.save(entity);
+        if (!save){
+            return ResultVOUtils.error("新增错误");
+        }
+        BasicCollectUserEntity basicCollectUserEntity = new BasicCollectUserEntity();
+        basicCollectUserEntity.setId(IdUtil.getSnowflakeNextId());
+//        basicCollectUserEntity.setCollectCode(entity.getCode());
+        basicCollectUserEntity.setUserId(Long.valueOf(entity.getChargeUser()));
+        basicCollectUserEntity.setCreateTime(new Date());
+        basicCollectUserEntity.setUpdateTime(new Date());
+        basicCollectUserEntity.setUpdateUser(this.getUserId() + "");
+        basicCollectUserEntity.setCreateUser(this.getUserId() + "");
+        boolean save1 = basicCollectUserService.save(basicCollectUserEntity);
+        if (!save1){
+            return ResultVOUtils.error("不好意思错误");
+        }
+        return ResultVOUtils.success("成功!!!!!");
+    }
+
+
+    @PostMapping("/udiwms/basic/collectPoints/updateCollectPoint")
+    public BaseResponse updateCollectPoint(@RequestBody BasicCollectPointEntity entity) {
+        entity.setUpdateTime(new Date());
+        entity.setCreateUser(this.getUserId() + "");
+        boolean save = basicCollectPointService.updateById(entity);
+        if (!save){
+            return ResultVOUtils.error("更新错误");
+        }
+        return ResultVOUtils.success("成功!!!!!");
+    }
+
+    @PostMapping("/udiwms/basic/collectPoints/delCollectPoint")
+    public BaseResponse delCollectPoint(@RequestBody BasicCollectPointEntity entity) {
+        boolean del = basicCollectPointService.removeById(entity);
+        if (!del){
+            return ResultVOUtils.error("删除错误");
+        }
+        return ResultVOUtils.success("成功!!!!!");
+    }
+
+
+    @PostMapping("/udiwms/basic/collectPoints/getUsers")
+    public BaseResponse getUser(@RequestBody FilterInvLinkDataRequest filterInvLinkDataRequest) {
+        List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.getListByCode(filterInvLinkDataRequest.getCode());
+        List<AuthAdmin> users = new ArrayList<>(warehouseUserEntities.size());
+        for (WarehouseUserEntity warehouseUserEntity : warehouseUserEntities) {
+            AuthAdmin user = authAdminService.getById(warehouseUserEntity.getUserid());
+            users.add(user);
+        }
+        return ResultVOUtils.success(users);
+    }
+
+}

src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java

@@ -0,0 +1,63 @@
+package com.glxp.api.controller.basic;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.basic.BasicCollectPointEntity;
+import com.glxp.api.entity.basic.BasicCollectUserEntity;
+import com.glxp.api.req.basic.BasicCollectRequest;
+import com.glxp.api.req.basic.BasicCollectUserRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.basic.UserWorkResponse;
+import com.glxp.api.service.basic.BasicCollectUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.Offset;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author : zhuzhu
+ * @date : 2024/8/13 9:50
+ * @modyified By :
+ */
+@Slf4j
+@RestController
+public class BasicCollectUserController {
+
+    @Resource
+    private BasicCollectUserService basicCollectUserService;
+
+    @GetMapping("/udiwms/sysWorkplace/getUserBindWork")
+    public BaseResponse getUserBindWork(BasicCollectUserRequest request) {
+        List<UserWorkResponse> list = basicCollectUserService.filterList(request);
+        return ResultVOUtils.success(list);
+    }
+
+    @PostMapping("/udiwms/sysWorkplace/userBindWork")
+    public BaseResponse userBindWork(@RequestBody BasicCollectUserRequest request) {
+        Boolean save =  basicCollectUserService.bindWorkplace(request);
+        if (!save) {
+            return ResultVOUtils.error("该用户已经绑定该工位");
+        }
+        return ResultVOUtils.success();
+    }
+
+
+
+
+    @PostMapping("/udiwms/sysWorkplace/delUserBindWork")
+    public BaseResponse delUserBindWork(@RequestBody BasicCollectUserEntity entity) {
+        boolean remove = basicCollectUserService.removeById(entity);
+        if (!remove){
+            return ResultVOUtils.error("删除失败");
+        }
+        return ResultVOUtils.success("删除成功!");
+    }
+
+
+}

src/main/java/com/glxp/api/dao/basic/BasicCollectPointCategoryMapper.java

@@ -0,0 +1,24 @@
+package com.glxp.api.dao.basic;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.basic.BasicCollectPointCategory;
+import com.glxp.api.req.basic.BasicCollectgoryRequest;
+import com.glxp.api.res.basic.BasicCollectGoryResponse;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.Pageable;
+import java.util.List;
+
+/**
+ * 工位关联表(BasicCollectPointCategory)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-08-14 10:52:11
+ */
+@Mapper
+public interface BasicCollectPointCategoryMapper extends BaseMapper<BasicCollectPointCategory> {
+
+
+    List<BasicCollectGoryResponse> getTreeList(BasicCollectgoryRequest request);
+}
+

src/main/java/com/glxp/api/dao/basic/BasicCollectPointMapper.java

@@ -1,9 +1,15 @@
 package com.glxp.api.dao.basic;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.glxp.api.entity.basic.BasicCollectPointEntity;
+import com.glxp.api.req.basic.BasicCollectRequest;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface BasicCollectPointMapper extends BaseMapper<BasicCollectPointEntity> {
+    List<BasicCollectPointEntity> filterList(BasicCollectRequest request);
 }

src/main/java/com/glxp/api/dao/basic/BasicCollectUserMapper.java

@@ -2,8 +2,13 @@ package com.glxp.api.dao.basic;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.basic.BasicCollectUserEntity;
+import com.glxp.api.req.basic.BasicCollectUserRequest;
+import com.glxp.api.res.basic.UserWorkResponse;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface BasicCollectUserMapper extends BaseMapper<BasicCollectUserEntity> {
+    List<UserWorkResponse> filterList(BasicCollectUserRequest request);
 }

src/main/java/com/glxp/api/entity/auth/SysWorkplace.java

@@ -82,7 +82,7 @@ public class SysWorkplace implements Serializable {
     @TableField(value = "checkInsert")
     private Integer checkInsert;
 
-//    @TableField(value = "warnType")
+    @TableField(value = "warnType")
     private Integer warnType;
 
 

src/main/java/com/glxp/api/entity/basic/BasicCollectPointCategory.java

@@ -0,0 +1,78 @@
+package com.glxp.api.entity.basic;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 工位关联表(BasicCollectPointCategory)实体类
+ *
+ * @author makejava
+ * @since 2024-08-14 10:52:11
+ */
+
+@Data
+@TableName(value = "basic_collect_point_category")
+public class BasicCollectPointCategory implements Serializable {
+    private static final long serialVersionUID = 541675163388493064L;
+
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value="ID")
+    private Long id;
+    /**
+     * 分组编码
+     */
+    @TableField(value = "code")
+    private String code;
+    /**
+     * 父级编码
+     */
+    @TableField(value = "parentCode")
+    private String parentCode;
+    /**
+     * 分组名称
+     */
+    @TableField(value = "name")
+    private String name;
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    private Date createTime;
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    private Date updateTime;
+    /**
+     * 创建人
+     */
+    @TableField(value = "createUser")
+    private String createUser;
+    /**
+     * 更新人
+     */
+    @TableField(value = "updateUser")
+    private String updateUser;
+
+    @TableField(value = "deptCode")
+    private String deptCode;
+
+    @TableField(value = "invCode")
+    private String invCode;
+
+
+
+}
+

src/main/java/com/glxp/api/entity/basic/BasicCollectPointEntity.java

@@ -21,8 +21,8 @@ public class BasicCollectPointEntity implements Serializable {
      * 备注
      */
     @TableId(value = "id", type = IdType.INPUT)
-    @ApiModelProperty(value="备注")
-    private Integer id;
+    @ApiModelProperty(value="ID")
+    private Long id;
 
     /**
      * 采集点编号
@@ -82,5 +82,18 @@ public class BasicCollectPointEntity implements Serializable {
     @ApiModelProperty(value="")
     private String updateUser;
 
+
+    /**
+     * 当前仓库
+     */
+    @TableField(value = "invCode")
+    private String invCode;
+
+    @TableField(exist = false)
+    private String invName;
+
+    @TableField(exist = false)
+    private String employeeName;
+
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/entity/basic/BasicCollectUserEntity.java

@@ -19,14 +19,14 @@ import lombok.Data;
 public class BasicCollectUserEntity implements Serializable {
     @TableId(value = "id", type = IdType.INPUT)
     @ApiModelProperty(value="")
-    private Integer id;
+    private Long id;
 
     /**
      * 采集点编码
      */
-    @TableField(value = "collectCode")
-    @ApiModelProperty(value="采集点编码")
-    private String collectCode;
+    @TableField(value = "workplaceCode")
+    @ApiModelProperty(value="工位编码")
+    private Long workplaceCode;
 
     /**
      * 用户ID

src/main/java/com/glxp/api/req/basic/BasicCollectRequest.java

@@ -0,0 +1,15 @@
+package com.glxp.api.req.basic;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+/**
+ * @author : zhangsan
+ * @date : 2024/8/13 10:42
+ * @modyified By :
+ */
+@Data
+public class BasicCollectRequest extends ListPageRequest {
+    private String key;
+    private String invCode;
+}

src/main/java/com/glxp/api/req/basic/BasicCollectUserRequest.java

@@ -0,0 +1,21 @@
+package com.glxp.api.req.basic;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+/**
+ * @author : zhangsan
+ * @date : 2024/8/14 18:55
+ * @modyified By :
+ */
+
+@Data
+public class BasicCollectUserRequest extends ListPageRequest {
+
+    private String userId;
+    private String workplaceId;
+    private String userKey;
+    private String workKey;
+
+
+}

src/main/java/com/glxp/api/req/basic/BasicCollectgoryRequest.java

@@ -0,0 +1,20 @@
+package com.glxp.api.req.basic;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BasicCollectgoryRequest  extends ListPageRequest {
+
+    private Long id;
+    private String code;
+    private String parentCode;
+    private String name;
+    private String remark;
+    private String deptCode;
+    private String invCode;
+
+    List<String> ids;
+}

src/main/java/com/glxp/api/res/basic/BasicCollectGoryResponse.java

@@ -0,0 +1,27 @@
+package com.glxp.api.res.basic;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author : zhangsan
+ * @date : 2024/8/14 11:03
+ * @modyified By :
+ */
+
+@Data
+public class BasicCollectGoryResponse {
+
+    private Long id;
+    private String code;
+    private String parentCode;
+    private String name;
+    private String remark;
+    private Date createTime;
+    private Date updateTime;
+    private String createUser;
+    private String updateUser;
+    private String label;
+
+}

src/main/java/com/glxp/api/res/basic/BasicCollectPointResponse.java

@@ -0,0 +1,18 @@
+package com.glxp.api.res.basic;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.glxp.api.entity.basic.BasicCollectPointEntity;
+import lombok.Data;
+
+/**
+ * @author : zhuzhu
+ * @date : 2024/8/13 14:26
+ * @modyified By :
+ */
+
+@Data
+public class BasicCollectPointResponse extends BasicCollectPointEntity {
+
+    //仓库名称
+    private String invName;
+}

src/main/java/com/glxp/api/res/basic/UserWorkResponse.java

@@ -1,7 +1,13 @@
 package com.glxp.api.res.basic;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.glxp.api.entity.auth.SysWorkplace;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.Size;
+import java.util.Date;
 
 /**
  * @author : zhangsan
@@ -10,6 +16,64 @@ import lombok.Data;
  */
 
 @Data
-public class UserWorkResponse extends SysWorkplace {
+public class UserWorkResponse  {
+
+
+
+    private String id;
+
+
+    private Long workplaceId;
+    /**
+     * 工位名称
+     */
+    private String workplaceName;
+    /**
+     * 所属仓库
+     */
+    private Integer invCode;
+    /**
+     * 备注
+     */
+    private String remake;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+
+
+
+    private String chargeUser;
+
+
+    private Long constituencies;
+
+
+
+    private Integer operationType;
+
+
+    private Integer checkInsert;
+
+
+    private Integer warnType;
+
+
+
+    private String unitTittle;
+
+
+    private String orderId;
+
+
+    private String invName;
+
+
+    private String labelId;
+
+
+    private String employeeName;
+    private String userName;
 
 }

src/main/java/com/glxp/api/service/basic/BasicCollectPointCategoryService.java

@@ -0,0 +1,72 @@
+package com.glxp.api.service.basic;
+
+import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.dao.basic.BasicCollectPointCategoryMapper;
+import com.glxp.api.entity.basic.BasicCollectPointCategory;
+import com.glxp.api.entity.basic.BasicProductCategory;
+import com.glxp.api.req.basic.BasicCollectgoryRequest;
+import com.glxp.api.res.basic.BasicCollectGoryResponse;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 工位关联表(BasicCollectPointCategory)表服务接口
+ *
+ * @author makejava
+ * @since 2024-08-14 10:52:12
+ */
+@Service
+public class BasicCollectPointCategoryService extends ServiceImpl<BasicCollectPointCategoryMapper, BasicCollectPointCategory> {
+
+
+    public List<BasicCollectGoryResponse> getTreeList(BasicCollectgoryRequest request) {
+        return super.baseMapper.getTreeList(request);
+    }
+
+    public Boolean checkName(BasicCollectgoryRequest request, int type) {
+        Long sum = null;
+        //1添加
+        if (type == 1) {
+            //查看名字是不是重复
+            QueryWrapper<BasicCollectPointCategory> ew = new QueryWrapper<>();
+            ew.eq("name", request.getName());
+            sum = super.baseMapper.selectCount(ew);
+        } else {
+            QueryWrapper<BasicCollectPointCategory> ew = new QueryWrapper<>();
+            ew.eq("name", request.getName());
+            ew.ne("id", request.getId());
+            sum = super.baseMapper.selectCount(ew);
+        }
+        if (sum > 0) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    public Boolean saveTree(BasicCollectgoryRequest request) {
+
+        boolean falg = true;
+        BasicCollectPointCategory basicCollectPointCategory = new BasicCollectPointCategory();
+        basicCollectPointCategory.setId(IdUtil.getSnowflakeNextId());
+        basicCollectPointCategory.setCreateTime(new Date());
+        basicCollectPointCategory.setUpdateTime(new Date());
+        basicCollectPointCategory.setName(request.getName());
+        basicCollectPointCategory.setParentCode(request.getParentCode());
+        basicCollectPointCategory.setRemark(request.getRemark());;
+        //获取数据库最大的code
+        QueryWrapper<BasicCollectPointCategory> ew = new QueryWrapper<>();
+        ew.select("max(code) as code");
+        BasicCollectPointCategory basicCollectPointCategory1 =  super.baseMapper.selectOne(ew);
+        basicCollectPointCategory.setCode(Integer.valueOf(basicCollectPointCategory1.getCode()) + 1 + "");
+        int insert = super.baseMapper.insert(basicCollectPointCategory);
+        if (insert == 0) {
+            falg = false;
+        }
+        return falg;
+    }
+}

src/main/java/com/glxp/api/service/basic/BasicCollectPointService.java

@@ -1,10 +1,28 @@
 package com.glxp.api.service.basic;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.entity.auth.SysWorkplace;
+import com.glxp.api.req.auth.SysWorkplaceRequest;
+import com.glxp.api.req.basic.BasicCollectRequest;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.dao.basic.BasicCollectPointMapper;
 import com.glxp.api.entity.basic.BasicCollectPointEntity;
+
+import java.util.Collections;
+import java.util.List;
+
 @Service
 public class BasicCollectPointService extends ServiceImpl<BasicCollectPointMapper, BasicCollectPointEntity> {
 
+    public List<BasicCollectPointEntity> filterList(BasicCollectRequest request) {
+        if (null == request) {
+            return Collections.emptyList();
+        }
+        if (null != request.getPage() && null != request.getLimit()) {
+            PageHelper.offsetPage((request.getPage() - 1) * request.getLimit(), request.getLimit());
+        }
+        return  super.baseMapper.filterList(request);
+    }
 }

src/main/java/com/glxp/api/service/basic/BasicCollectUserService.java

@@ -1,10 +1,45 @@
 package com.glxp.api.service.basic;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.glxp.api.req.basic.BasicCollectUserRequest;
+import com.glxp.api.res.basic.UserWorkResponse;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.dao.basic.BasicCollectUserMapper;
 import com.glxp.api.entity.basic.BasicCollectUserEntity;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
 @Service
 public class BasicCollectUserService extends ServiceImpl<BasicCollectUserMapper, BasicCollectUserEntity> {
 
+    @Resource
+    BasicCollectUserMapper basicCollectUserMapper;
+
+    public List<UserWorkResponse> filterList(BasicCollectUserRequest request) {
+        List<UserWorkResponse> list = basicCollectUserMapper.filterList(request);
+        return list;
+    }
+
+    public Boolean bindWorkplace(BasicCollectUserRequest request) {
+        BasicCollectUserEntity basicCollectUserEntity = basicCollectUserMapper.selectOne(new LambdaQueryWrapper<BasicCollectUserEntity>()
+                .eq(BasicCollectUserEntity::getUserId, request.getUserId())
+                .eq(BasicCollectUserEntity::getWorkplaceCode,request.getWorkplaceId()));
+        if (basicCollectUserEntity != null){
+            //该用户已经绑定改工位
+            return false;
+        }
+        BasicCollectUserEntity entity = new BasicCollectUserEntity();
+        entity.setUserId(Long.valueOf(request.getUserId()));
+        entity.setWorkplaceCode(Long.valueOf(request.getWorkplaceId()));
+        entity.setCreateTime(new Date());
+        entity.setUpdateTime(new Date());
+        int insert = basicCollectUserMapper.insert(entity);
+        if (insert == 0){
+            return false;
+        }
+        return true;
+    }
 }

src/main/resources/mybatis/mapper/basic/BasicCollectPointCategoryMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.api.dao.basic.BasicCollectPointCategoryMapper">
+
+    <select id="getTreeList" resultType="com.glxp.api.res.basic.BasicCollectGoryResponse">
+        SELECT id, code, name as label, parentCode, remark
+        FROM basic_collect_point_category
+        <where>
+            <if test="deptCode != '' and deptCode != null">
+                and deptCode = #{deptCode}
+            </if>
+            <if test="invCode != '' and invCode != null">
+                and invCode = #{invCode}
+            </if>
+        </where>
+        ORDER BY id DESC
+    </select>
+</mapper>

src/main/resources/mybatis/mapper/basic/BasicCollectPointMapper.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.basic.BasicCollectPointMapper">
+    <select id="filterList" resultType="com.glxp.api.entity.basic.BasicCollectPointEntity">
+        select bcp.*,aw.name invName,auth_user.employeeName as employeeName
+        from basic_collect_point bcp
+        left join auth_warehouse aw on bcp.invCode = aw.code
+        left join auth_user on auth_user.id = bcp.chargeUser
+        <where>
+            <if test="key != null and key != ''">
+                AND (bcp.name like concat('%', #{key}, '%')
+                or bcp.code like concat('%', #{key}, '%')
+                )
+            </if>
+            <if test=" invCode != null and invCode != ''">
+                AND bcp.invCode = #{invCode}
+            </if>
+        </where>
+        ORDER BY bcp.updateTime desc
+    </select>
 </mapper>

src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml

@@ -1,4 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.basic.BasicCollectUserMapper">
+    <select id="filterList" resultType="com.glxp.api.res.basic.UserWorkResponse">
+        select bcu.id,sw.workplaceName,sw.invCode,sw.workplaceId,sw.constituencies,sw.operationType,sw.checkInsert,sw.warnType,sw.unitTittle,
+               au.userName,au.employeeName
+         from basic_collect_user bcu
+            left join auth_user au on bcu.userId = au.id
+            left join sys_workplace sw on bcu.workplaceCode = sw.workplaceId
+        <where>
+            <if test=" userId != null and userId != ''">
+                AND bcu.userId = #{userId}
+            </if>
+            <if test=" workplaceId != null and workplaceId != ''">
+                AND bcu.workplaceCode = #{workplaceId}
+            </if>
+            <if test="userKey != null and userKey != ''">
+                AND (bcp.name like concat('%', #{userKey}, '%')
+                or bcp.code like concat('%', #{userKey}, '%')
+                )
+            </if>
+        </where>
+    </select>
+
 </mapper>