8/22 现场管理工位调整，单据

src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java

@@ -31,6 +31,7 @@ import com.glxp.api.res.basic.SysWorkplaceResponse;
 import com.glxp.api.res.basic.UserWorkResponse;
 import com.glxp.api.res.basic.WorkBindWorkResponse;
 import com.glxp.api.service.auth.AuthAdminService;
+import com.glxp.api.service.auth.DeptService;
 import com.glxp.api.service.auth.SysWorkplaceService;
 import com.glxp.api.service.auth.WarehouseUserService;
 import com.glxp.api.service.basic.BasicCollectUserService;
@@ -142,10 +143,10 @@ public class SysWorkplaceController extends BaseController {
         }
         WorkBindBusTypeRequest workBindBusTypeRequest = new WorkBindBusTypeRequest();
         workBindBusTypeRequest.setWorkplaceCode(String.valueOf(sysWorkplace.getWorkplaceId()));
-        List<WorkBindWorkResponse> workBindWorkResponses = sysWorkplaceDocumentService.filterList(workBindBusTypeRequest);
+//        List<WorkBindWorkResponse> workBindWorkResponses = sysWorkplaceDocumentService.filterList(workBindBusTypeRequest);
-        if (workBindWorkResponses.size() > 0) {
+//        if (workBindWorkResponses.size() > 0) {
-            return ResultVOUtils.error("当前工位已绑定单据类型,请解绑之后在删除");
+//            return ResultVOUtils.error("当前工位已绑定单据类型,请解绑之后在删除");
-        }
+//        }
         boolean save = sysWorkplaceService.removeById(sysWorkplace);
         if (!save) {
             return ResultVOUtils.error("删除错误");
@@ -243,20 +244,15 @@ public class SysWorkplaceController extends BaseController {
     @Resource
     private WarehouseUserService warehouseUserService;
 
+    @Resource
+    DeptService deptService;
+
     @Resource
     private AuthAdminService authAdminService;
 
     @PostMapping("/udiwms/sysWorkplace/getUsers")
     public BaseResponse getUser(@RequestBody SysWorkplaceRequest request) {
-        if (request.getInvCode() == null) {
+        List<AuthAdmin> authAdmins = authAdminService.getUserByDeptCode(request.getDeptCode());
-            //todo 没有搜索仓库 搜索所有用户
-        }
-        List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.getListByCode(request.getInvCode());
-        List<Long> userIds = warehouseUserEntities.stream()
-                .map(WarehouseUserEntity::getUserid)
-                .collect(Collectors.toList());
-        request.setIds(userIds);
-        List<AuthAdmin> authAdmins = authAdminService.getUserByIds(request);
         PageInfo<AuthAdmin> pageInfo = new PageInfo<>(authAdmins);
         PageSimpleResponse<AuthAdmin> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());

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

@@ -2,6 +2,7 @@ package com.glxp.api.controller.basic;
 
 import cn.hutool.core.text.split.SplitIter;
 import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
@@ -12,6 +13,7 @@ import com.glxp.api.req.basic.BasicCollectBusTypeRequest;
 import com.glxp.api.req.basic.WorkBindBusTypeRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.BasicCollectBusTypeResponse;
+import com.glxp.api.res.basic.SysWorkplaceDocumentResponse;
 import com.glxp.api.res.basic.WorkBindWorkResponse;
 import com.glxp.api.service.auth.SysWorkplaceService;
 import com.glxp.api.service.basic.BasicCollectBustypeService;
@@ -59,6 +61,10 @@ public class BasicCollectBusTypeController {
 
     @PostMapping("/udiwms/basic/collectPoints/addCollectBusType")
     public BaseResponse addCollectBusType(@RequestBody BasicCollectBustypeEntity entity) {
+        BasicCollectBustypeEntity one = basicCollectBustypeService.getOne(new LambdaQueryWrapper<BasicCollectBustypeEntity>().eq(BasicCollectBustypeEntity::getFromBusTypeCode, entity.getFromBusTypeCode()));
+        if (one != null){
+            return ResultVOUtils.error("来源单据类型编号重复");
+        }
         entity.setId(IdUtil.getSnowflakeNextId());
         entity.setCreateTime(new Date());
         entity.setUpdateTime(new Date());
@@ -87,10 +93,11 @@ public class BasicCollectBusTypeController {
 //            return ResultVOUtils.error("当前单据已绑定工位,请先进行解绑!");
 //        }
         WorkBindBusTypeRequest workBindBusTypeRequest = new WorkBindBusTypeRequest();
-        workBindBusTypeRequest.setCode(entity.getCode());
+        workBindBusTypeRequest.setDocumentTypeCode(entity.getFromDocumentType());
-        List<WorkBindWorkResponse> workBindWorkResponses = sysWorkplaceDocumentService.filterList(workBindBusTypeRequest);
+        List<SysWorkplaceDocumentResponse> sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterList(workBindBusTypeRequest);
-        if (workBindWorkResponses.size() > 0) {
+
-            return ResultVOUtils.error("当前单据类型已选入工位,请解绑之后在删除");
+        if (sysWorkplaceDocumentResponses.size() > 0) {
+            return ResultVOUtils.error("当前单据类型已被绑定,请解绑之后在删除");
         }
         boolean del = basicCollectBustypeService.removeById(entity);
         if (!del){

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

@@ -2,6 +2,8 @@ package com.glxp.api.controller.basic;
 
 
 
+import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
@@ -9,6 +11,7 @@ import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity;
 import com.glxp.api.req.basic.WorkBindBusTypeRequest;
 import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.basic.SysWorkplaceDocumentResponse;
 import com.glxp.api.res.basic.UserWorkResponse;
 import com.glxp.api.res.basic.WorkBindWorkResponse;
 import com.glxp.api.service.basic.SysWorkplaceDocumentService;
@@ -36,9 +39,9 @@ public class SysWorkplaceDocumentController extends BaseController {
 
     @GetMapping("/udiwms/sysWorkplace/getWorkBindBusTypes")
     public BaseResponse getUserBindWork(WorkBindBusTypeRequest request){
-      List<WorkBindWorkResponse> page =  sysWorkplaceDocumentService.filterList(request);
+      List<SysWorkplaceDocumentResponse> page =  sysWorkplaceDocumentService.filterList(request);
-        PageInfo<WorkBindWorkResponse> pageInfo = new PageInfo<>(page);
+        PageInfo<SysWorkplaceDocumentResponse> pageInfo = new PageInfo<>(page);
-        PageSimpleResponse<WorkBindWorkResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        PageSimpleResponse<SysWorkplaceDocumentResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(page);
         return ResultVOUtils.success(pageSimpleResponse);
@@ -54,7 +57,32 @@ public class SysWorkplaceDocumentController extends BaseController {
       return ResultVOUtils.success("绑定成功");
     }
 
+    @PostMapping("/udiwms/sysWorkplace/addBusType")
+    public BaseResponse addBusType(@RequestBody SysWorkplaceDocumentEntity entity){
+        Long userId = this.getUserId();
+        SysWorkplaceDocumentEntity one = sysWorkplaceDocumentService.getOne(new LambdaQueryWrapper<SysWorkplaceDocumentEntity>().eq(SysWorkplaceDocumentEntity::getDocumentTypeCode, entity.getDocumentTypeCode())
+                .eq(SysWorkplaceDocumentEntity::getWorkplaceCode, entity.getWorkplaceCode()));
+        if (one != null){
+            return ResultVOUtils.error("该工位已经有当前类型单据");
+        }
+        boolean save = sysWorkplaceDocumentService.addBusType(entity,userId);
+        if (!save){
+            return ResultVOUtils.error("新增失败");
+        }
+        return ResultVOUtils.success("新增成功");
+    }
+
 
+    @PostMapping("/udiwms/sysWorkplace/updateType")
+    public BaseResponse updateType(@RequestBody SysWorkplaceDocumentEntity entity){
+
+
+        boolean save = sysWorkplaceDocumentService.updateById(entity);
+        if (!save){
+            return ResultVOUtils.error("更新失败");
+        }
+        return ResultVOUtils.success("更新成功");
+    }
 
     @PostMapping("/udiwms/sysWorkplace/removeBusTypeById")
     public BaseResponse removeBusTypeById(@RequestBody SysWorkplaceDocumentEntity entity){

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

@@ -3,6 +3,7 @@ package com.glxp.api.dao.basic;
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity;
 import com.glxp.api.req.basic.WorkBindBusTypeRequest;
+import com.glxp.api.res.basic.SysWorkplaceDocumentResponse;
 import com.glxp.api.res.basic.WorkBindWorkResponse;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -18,7 +19,7 @@ import java.util.List;
 @Mapper
 public interface SysWorkplaceDocumentDao extends BaseMapperPlus<SysWorkplaceDocumentDao, SysWorkplaceDocumentEntity, SysWorkplaceDocumentEntity>{
 
-    List<WorkBindWorkResponse> filterList(WorkBindBusTypeRequest request);
+    List<SysWorkplaceDocumentResponse> filterList(WorkBindBusTypeRequest request);
 }
 
 

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

@@ -134,6 +134,12 @@ public class SysWorkplace implements Serializable {
     @TableField(value = "invRemindNumber")
     private Integer invRemindNumber;
 
+    /**
+     *  工位类型 1:拆零;2:取整;3:全部
+     */
+    @TableField(value = "workplaceType")
+    private Integer workplaceType;
+
 
     @TableField(exist = false)
     private String invName;

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

@@ -6,38 +6,39 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.io.Serializable;
 import java.util.Date;
 
 import lombok.Data;
 
 /**
-    * 工位单据类型表
+ * 单据类型表
-    */
+ */
-@ApiModel(value="com-glxp-api-entity-basic-BasicCollectBustype")
+@ApiModel(value = "com-glxp-api-entity-basic-BasicCollectBustype")
 @Data
 @TableName(value = "basic_collect_bustype")
 public class BasicCollectBustypeEntity implements Serializable {
     @TableId(value = "id", type = IdType.INPUT)
-    @ApiModelProperty(value="")
+    @ApiModelProperty(value = "")
     private Long id;
 
     /**
      * 单据类型编号
      */
     @TableField(value = "code")
-    @ApiModelProperty(value="单据类型编号")
+    @ApiModelProperty(value = "单据类型编号")
     private String code;
 
     /**
      * 单据类型名称
      */
     @TableField(value = "`name`")
-    @ApiModelProperty(value="单据类型名称")
+    @ApiModelProperty(value = "单据类型名称")
     private String name;
 
     /**
-     * 来源：
+     * 来源单据
      */
     @TableField(value = "fromType")
     private String fromType;
@@ -59,7 +60,7 @@ public class BasicCollectBustypeEntity implements Serializable {
      * 来源单据类型
      */
     @TableField(value = "fromDocumentType")
-    @ApiModelProperty(value="来源单据类型")
+    @ApiModelProperty(value = "来源单据类型")
     private String fromDocumentType;
 
 
@@ -67,26 +68,26 @@ public class BasicCollectBustypeEntity implements Serializable {
      * 来源接口地址
      */
     @TableField(value = "fromInterAddress")
-    @ApiModelProperty(value="来源接口地址")
+    @ApiModelProperty(value = "来源接口地址")
     private String fromInterAddress;
 
     /**
      * 备注
      */
     @TableField(value = "remark")
-    @ApiModelProperty(value="备注")
+    @ApiModelProperty(value = "备注")
     private String remark;
 
     @TableField(value = "invCode")
-    @ApiModelProperty(value="仓库编号")
+    @ApiModelProperty(value = "仓库编号")
     private String invCode;
 
     @TableField(value = "createTime")
-    @ApiModelProperty(value="")
+    @ApiModelProperty(value = "")
     private Date createTime;
 
     @TableField(value = "updateTime")
-    @ApiModelProperty(value="")
+    @ApiModelProperty(value = "")
     private Date updateTime;
 
 
@@ -96,5 +97,12 @@ public class BasicCollectBustypeEntity implements Serializable {
     @TableField(value = "sortNumber")
     private Integer sortNumber;
 
+    /**
+     * 来源单据类型编号:
+     */
+    @TableField(value = "fromBusTypeCode")
+    private String fromBusTypeCode;
+
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -4,10 +4,11 @@ import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
- * (SysWorkplaceDocument)表实体类
+ * 工位单据类型
  *
  * @author makejava
  * @since 2024-08-20 16:58:57
@@ -22,7 +23,7 @@ public class SysWorkplaceDocumentEntity {
 
     //工位编码
     @TableField(value = "workplaceCode")
-    private Long workplacecode;
+    private Long workplaceCode;
 
 
     //单据编码
@@ -53,5 +54,65 @@ public class SysWorkplaceDocumentEntity {
     private String updateUser;
 
 
-    }
+
+
+
+    /**
+     * 业务名字
+     */
+    @TableField(value = "busName")
+    private String busName;
+
+
+    /**
+     * 扫码方式
+     * 1.扫码生成业务单
+     * 2.按单校验三期
+     * 3.按单不校验三期
+     */
+    @TableField(value = "scanType")
+    private Integer scanType;
+
+    /**
+     * 异常提醒方式 1:信息提醒 2:信息弹框提醒 3:不提醒
+     */
+    @TableField(value = "warnType")
+    private Integer warnType;
+
+
+    /**
+     * 处理结果 1:自动添加 2自动不添加 3根据提醒决定
+     */
+    @TableField(value = "checkInsert")
+    private Integer checkInsert;
+
+    /**
+     * 所属仓库
+     */
+    @ApiModelProperty("所属仓库")
+    @TableField(value = "invCode")
+    private Integer invCode;
+
+
+    /**
+     * 往来单位类型 1:客户,2:供应商,3:内部科室,4:特殊往来
+     */
+    @TableField(value = "corpType")
+    private Integer corpType;
+
+
+    /**
+     * 是否配套系统 0:否 1:是
+     */
+    @TableField(value = "isMatching")
+    private Integer isMatching;
+
+    /**
+     * 往来标题类型
+     */
+    @TableField(value = "unitTittle")
+    private String unitTittle;
+
+
+}
 

src/main/java/com/glxp/api/req/auth/SysWorkplaceRequest.java

@@ -15,6 +15,7 @@ import java.util.List;
 public class SysWorkplaceRequest extends ListPageRequest {
     private String key;
     private String invCode;
+    private String deptCode;
 
     //
     private String code;

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

@@ -13,11 +13,12 @@ import java.util.List;
 
 @Data
 public class WorkBindBusTypeRequest extends ListPageRequest {
-    private List<String> documentTypeCode;
+//    private List<String> documentTypeCode;
     private String workplaceCode;
     private String code;
     private String busKey;
     private String workKey;
+    private String documentTypeCode;
 
 
 }

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

@@ -0,0 +1,113 @@
+package com.glxp.api.res.basic;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author : zhangsan
+ * @date : 2024/8/21 19:35
+ * @modyified By :
+ */
+
+@Data
+public class SysWorkplaceDocumentResponse {
+
+    @TableField(value = "id")
+    private Long id;
+
+
+    //工位编码
+    @TableField(value = "workplaceCode")
+    private Long workplaceCode;
+
+
+    //单据编码
+    @TableField(value = "documentTypeCode")
+    private String documentTypeCode;
+    /**
+     * 创建时间
+     */
+    @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 = "busName")
+    private String busName;
+
+
+    /**
+     * 扫码方式
+     * 1.扫码生成业务单
+     * 2.按单校验三期
+     * 3.按单不校验三期
+     */
+    @TableField(value = "scanType")
+    private Integer scanType;
+
+    /**
+     * 异常提醒方式 1:信息提醒 2:信息弹框提醒 3:不提醒
+     */
+    @TableField(value = "warnType")
+    private Integer warnType;
+
+
+    /**
+     * 处理结果 1:自动添加 2自动不添加 3根据提醒决定
+     */
+    @TableField(value = "checkInsert")
+    private Integer checkInsert;
+
+    /**
+     * 所属仓库
+     */
+    @ApiModelProperty("所属仓库")
+    @TableField(value = "invCode")
+    private Integer invCode;
+
+
+    /**
+     * 往来单位类型 1:客户,2:供应商,3:内部科室,4:特殊往来
+     */
+    @TableField(value = "corpType")
+    private Integer corpType;
+
+
+    /**
+     * 是否配套系统 0:否 1:是
+     */
+    @TableField(value = "isMatching")
+    private Integer isMatching;
+
+    /**
+     * 往来标题类型
+     */
+    @TableField(value = "unitTittle")
+    private String unitTittle;
+
+    private String invName;
+
+}

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

@@ -2,7 +2,12 @@ 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
@@ -11,7 +16,149 @@ import lombok.Data;
  */
 
 @Data
-public class SysWorkplaceResponse extends SysWorkplace {
+public class SysWorkplaceResponse {
+
+    /**
+     * 工位编码
+     */
+    @TableField(value = "id")
+    private Long id;
+
+    /**
+     * 工位编码
+     */
+
+    @ApiModelProperty("工位编码")
+    @TableField(value = "workplaceId")
+    private Long workplaceId;
+    /**
+     * 工位名称
+     */
+    @Size(max = 255, message = "编码长度不能超过255")
+    @ApiModelProperty("工位名称")
+    @Length(max = 255, message = "编码长度不能超过255")
+    @TableField(value = "workplaceName")
+    private String workplaceName;
+    /**
+     * 所属仓库
+     */
+    @ApiModelProperty("所属仓库")
+    @TableField(value = "invCode")
+    private Integer invCode;
+    /**
+     * 备注
+     */
+    @Size(max = 255, message = "编码长度不能超过255")
+    @ApiModelProperty("备注")
+    @Length(max = 255, message = "编码长度不能超过255")
+    @TableField(value = "remake")
+    private String remake;
+    /**
+     *
+     */
+    @ApiModelProperty("")
+    @TableField(value = "createTime")
+    private Date createTime;
+    /**
+     *
+     */
+    @ApiModelProperty("")
+    @TableField(value = "updateTime")
+    private Date updateTime;
+
+
+    @TableField(value = "chargeUser")
+    private String chargeUser;
+
+    @TableField(value = "constituencies")
+    private String constituencies;
+
+
+    /**
+     * 1.扫码生成业务单
+     * 2.按单校验三期
+     * 3.按单不校验三期（
+     */
+    @TableField(value = "operationType")
+    private Integer operationType;
+
+    /**
+     * 1: '插入',
+     * 2: '不插入',
+     * 3: '提醒不插入'
+     */
+    @TableField(value = "checkInsert")
+    private Integer checkInsert;
+
+    /**
+     * 1: '信息提醒',
+     * 2: '信息弹框提醒',
+     * 3: '不提醒'
+     */
+    @TableField(value = "warnType")
+    private Integer warnType;
+
+
+    @TableField(value = "unitTittle")
+    private String unitTittle;
+
+
+    /**
+     * 来源单据的编号 basic_collect_bustype表里面的code
+     */
+    @TableField(value = "orderId")
+    private String orderId;
+
+    /**
+     * 往来单位类型 1:客户,2:供应商,3:内部科室,4:特殊往来
+     */
+    @TableField(value = "corpType")
+    private Integer corpType;
+
+
+    /**
+     * 工位状态 0:停用 1:在用
+     */
+    @TableField(value = "workplaceStatus")
+    private Integer workplaceStatus;
+
+    /**
+     * 部门编码
+     */
+    @TableField(value = "deptCode")
+    private String deptCode;
+
+    /**
+     * 存量提醒数
+     */
+    @TableField(value = "invRemindNumber")
+    private Integer invRemindNumber;
+
+    /**
+     *  工位类型 1:拆零;2:取整;3:全部
+     */
+    @TableField(value = "workplaceType")
+    private Integer workplaceType;
+
+
+    @TableField(exist = false)
+    private String invName;
+
+    @TableField(exist = false)
+    private String labelId;
+
+    /**
+     * 工位负责人
+     */
+    @TableField(exist = false)
+    private String employeeName;
+
+    //单据来源系统
+    @TableField(exist = false)
+    private String fromTypeName;
+
+    @TableField(exist = false)
+    public Integer orderCount;
 
 
     //组别名称
@@ -22,8 +169,6 @@ public class SysWorkplaceResponse extends SysWorkplace {
     //单据名称
     private String busTypeName;
 
-    //单据来源系统
-    private String fromTypeName;
 
     //所属部门名称
     private String deptCodeName;

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

@@ -77,4 +77,13 @@ public class UserWorkResponse  {
     private String userName;
     private Integer corpType;
 
+    private Integer invRemindNumber;
+    private Integer workplaceStatus;
+    private Integer workplaceType;
+    private String deptCodeName;
+
+
+
+
+
 }

src/main/java/com/glxp/api/service/auth/AuthAdminService.java

@@ -48,4 +48,6 @@ public interface AuthAdminService extends IService<AuthAdmin> {
 
 
     List<AuthAdmin> getUserByIds(SysWorkplaceRequest request);
+
+    List<AuthAdmin> getUserByDeptCode(String deptCode);
 }

src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java

@@ -2,6 +2,7 @@ package com.glxp.api.service.auth.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ArrayUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.auth.AuthAdminDao;
@@ -200,6 +201,12 @@ public class AuthAdminServiceImpl extends ServiceImpl<AuthAdminDao, AuthAdmin> i
         return authAdminDao.getUserByIds(request.getIds(),request.getKey());
     }
 
+    @Override
+    public List<AuthAdmin> getUserByDeptCode(String deptCode) {
+        List<AuthAdmin> authAdmins = authAdminDao.selectList(new LambdaQueryWrapper<AuthAdmin>().eq(AuthAdmin::getLocDeptCode, deptCode));
+        return authAdmins;
+    }
+
 
     public void insertUserRole(Long userId, List<Long> roleIds) {
         if (ArrayUtil.isNotEmpty(roleIds)) {

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

@@ -7,6 +7,7 @@ import com.glxp.api.dao.basic.SysWorkplaceDocumentDao;
 import com.glxp.api.entity.basic.BasicCollectUserEntity;
 import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity;
 import com.glxp.api.req.basic.WorkBindBusTypeRequest;
+import com.glxp.api.res.basic.SysWorkplaceDocumentResponse;
 import com.glxp.api.res.basic.WorkBindWorkResponse;
 import org.springframework.stereotype.Service;
 
@@ -29,39 +30,52 @@ public class SysWorkplaceDocumentService extends ServiceImpl<SysWorkplaceDocumen
 
 
 
-    public List<WorkBindWorkResponse> filterList(WorkBindBusTypeRequest request) {
+    public List<SysWorkplaceDocumentResponse> filterList(WorkBindBusTypeRequest request) {
-        List<WorkBindWorkResponse> list =  sysWorkplaceDocumentDao.filterList(request);
+        List<SysWorkplaceDocumentResponse> list =  sysWorkplaceDocumentDao.filterList(request);
         return list;
     }
 
     public Boolean bindBusType(WorkBindBusTypeRequest request,Long userId) {
-        List<String> documentTypeCodes = request.getDocumentTypeCode();
+//        List<String> documentTypeCodes = request.getDocumentTypeCode();
-        for (String  documentTypeCode: documentTypeCodes) {
+//        for (String  documentTypeCode: documentTypeCodes) {
-            SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentDao.selectOne(new LambdaQueryWrapper<SysWorkplaceDocumentEntity>()
+//            SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentDao.selectOne(new LambdaQueryWrapper<SysWorkplaceDocumentEntity>()
-                    .eq(SysWorkplaceDocumentEntity::getWorkplacecode, request.getWorkplaceCode())
+//                    .eq(SysWorkplaceDocumentEntity::getWorkplaceCode, request.getWorkplaceCode())
-                    .eq(SysWorkplaceDocumentEntity::getDocumentTypeCode,documentTypeCode));
+//                    .eq(SysWorkplaceDocumentEntity::getDocumentTypeCode,documentTypeCode));
-            if (sysWorkplaceDocumentEntity != null){
+//            if (sysWorkplaceDocumentEntity != null){
-                //该用户已经绑定改工位
+//                //该用户已经绑定改工位
-                return false;
+//                return false;
-            }
+//            }
-        }
+//        }
-        for (String  documentTypeCode: documentTypeCodes) {
+//        for (String  documentTypeCode: documentTypeCodes) {
-            SysWorkplaceDocumentEntity entity = new SysWorkplaceDocumentEntity();
+//            SysWorkplaceDocumentEntity entity = new SysWorkplaceDocumentEntity();
-            entity.setId(IdUtil.getSnowflakeNextId());
+//            entity.setId(IdUtil.getSnowflakeNextId());
-            entity.setWorkplacecode(Long.valueOf(request.getWorkplaceCode()));
+////            String workplaceCode = request.getWorkplaceCode();
-            entity.setDocumentTypeCode(documentTypeCode);
+////            entity.getWorkplaceCode(Long.valueOf(request.getWorkplaceCode()));
-            entity.setCreateTime(new Date());
+//            entity.setDocumentTypeCode(documentTypeCode);
-            entity.setUpdateTime(new Date());
+//            entity.setCreateTime(new Date());
-            entity.setUpdateUser(userId.toString());
+//            entity.setUpdateTime(new Date());
-            entity.setCreateUser(userId.toString());
+//            entity.setUpdateUser(userId.toString());
-            int insert = sysWorkplaceDocumentDao.insert(entity);
+//            entity.setCreateUser(userId.toString());
-            if (insert == 0){
+//            int insert = sysWorkplaceDocumentDao.insert(entity);
-                return false;
+//            if (insert == 0){
-            }
+//                return false;
-        }
+//            }
+//        }
         return true;
 
     }
 
+    public boolean addBusType(SysWorkplaceDocumentEntity entity, Long userId) {
+        entity.setId(IdUtil.getSnowflakeNextId());
+        entity.setCreateTime(new Date());
+        entity.setUpdateTime(new Date());
+        entity.setUpdateUser(userId.toString());
+        entity.setCreateUser(userId.toString());
+        int insert = sysWorkplaceDocumentDao.insert(entity);
+        if (insert == 0){
+            return false;
+        }
+        return true;
+    }
 }
 

src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml

@@ -25,6 +25,9 @@
             <if test=" request.invCode != null and request.invCode != ''">
                 AND sw.invCode = #{request.invCode}
             </if>
+            <if test=" request.deptCode != null and request.deptCode != ''">
+                AND sw.deptCode = #{request.deptCode}
+            </if>
             <if test=" request.workplaceStatus != null">
                 AND sw.workplaceStatus = #{request.workplaceStatus}
             </if>

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

@@ -8,7 +8,7 @@
         <where>
             <if test="key != null and key != ''">
                 AND (bcb.name like concat('%', #{key}, '%')
-                or bcb.code like concat('%', #{key}, '%')
+                or bcb.fromBusTypeCode like concat('%', #{key}, '%')
                 )
             </if>
             <if test=" invCode != null and invCode != ''">

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

@@ -3,10 +3,11 @@
 <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,sw.corpType,
-               au.userName,au.employeeName,sw.createTime as createTime
+               au.userName,au.employeeName,sw.createTime as createTime,sw.workplaceStatus,sw.workplaceType,sw.invRemindNumber,ad.name deptCodeName
          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
+            left join auth_dept ad on ad.code = sw.deptCode
         <where>
             <if test=" userId != null and userId != ''">
                 AND bcu.userId = #{userId}

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

@@ -1,23 +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.SysWorkplaceDocumentDao">
-    <select id="filterList" resultType="com.glxp.api.res.basic.WorkBindWorkResponse">
+
-        select
+    <select id="filterList" resultType="com.glxp.api.res.basic.SysWorkplaceDocumentResponse">
-        swd.id,sw.workplaceName,sw.invCode,sw.workplaceId,sw.constituencies,sw.operationType,sw.checkInsert,sw.warnType,sw.unitTittle,sw.corpType,
+        select sys_workplace_document.*,aw.name invName
-        bcb.code,bcb.name,bcb.remark as remark,sw.createTime as createTime
+        from  sys_workplace_document
-        from sys_workplace_document swd
+        left join auth_warehouse aw on aw.code = sys_workplace_document.invCode
-        left join basic_collect_bustype bcb on swd.documentTypeCode = bcb.code
-        left join sys_workplace sw on swd.workplaceCode = sw.workplaceId
         <where>
-            <if test=" workplaceCode != null and workplaceCode != ''">
+            <if test="workplaceCode != '' and workplaceCode != null">
-                AND swd.workplaceCode = #{workplaceCode}
+                AND workplaceCode = #{workplaceCode}
             </if>
-            <if test=" code != null and code != ''">
+            <if test="documentTypeCode != '' and documentTypeCode != null">
-                AND swd.documentTypeCode = #{code}
+                AND documentTypeCode = #{documentTypeCode}
             </if>
             <if test="busKey != null and busKey != ''">
-                AND (bcb.code like concat('%', #{busKey}, '%')
+                AND (sys_workplace_document.documentTypeCode like concat('%', #{busKey}, '%')
-                or bcb.name like concat('%', #{busKey}, '%')
+                or sys_workplace_document.busName like concat('%', #{busKey}, '%')
                 )
             </if>
         </where>