From 9b5e03278e9b4c99587c37e0d815f5170e38925a Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Sun, 29 Sep 2024 11:37:43 +0800 Subject: [PATCH] =?UTF-8?q?9/29=20=E5=B7=A5=E4=BD=8D=E7=BB=B4=E6=8A=A4-?= =?UTF-8?q?=E4=B8=8A=E8=B4=A7=E5=B7=A5=E4=BD=8D=E4=BC=98=E5=8C=961.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/SysWorkplacePutRelController.java | 13 ++++++++++++- .../com/glxp/api/entity/basic/SysWorkplaceBus.java | 4 ++-- .../glxp/api/req/basic/CargowWorkplaceRequest.java | 3 ++- .../api/res/basic/SysWorkplaceDocumentResponse.java | 1 + .../api/res/basic/SysWorkplacePutRelResponse.java | 3 +++ .../mapper/basic/SysWorkplaceDocumentDao.xml | 3 ++- .../mapper/basic/SysWorkplacePutRelMapper.xml | 10 +++++++++- 7 files changed, 31 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/SysWorkplacePutRelController.java b/src/main/java/com/glxp/api/controller/basic/SysWorkplacePutRelController.java index 1673c4cef..dfd6f35bc 100644 --- a/src/main/java/com/glxp/api/controller/basic/SysWorkplacePutRelController.java +++ b/src/main/java/com/glxp/api/controller/basic/SysWorkplacePutRelController.java @@ -1,10 +1,12 @@ package com.glxp.api.controller.basic; +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; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.basic.BasicCollectPointEntity; +import com.glxp.api.entity.basic.SysWorkplacePutRel; import com.glxp.api.req.basic.BasicCollectRequest; import com.glxp.api.req.basic.CargowWorkplaceRequest; import com.glxp.api.req.basic.WorkBindBusTypeRequest; @@ -35,7 +37,7 @@ public class SysWorkplacePutRelController extends BaseController { @PostMapping("/udiwms/sysWorkplace/bindCollect") public BaseResponse bindCollect(@RequestBody CargowWorkplaceRequest request) { - BaseResponse success = sysWorkplacePutRelService.bindCollect(request,getUserId()); + BaseResponse success = sysWorkplacePutRelService.bindCollect(request,getUserId()); return success; } @@ -50,4 +52,13 @@ public class SysWorkplacePutRelController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } + @PostMapping("/udiwms/sysWorkplace/delCollect") + public BaseResponse delCollect(@RequestBody CargowWorkplaceRequest request) { + boolean remove = sysWorkplacePutRelService.remove(new LambdaQueryWrapper().eq(SysWorkplacePutRel::getId, request.getId())); + if (!remove){ + return ResultVOUtils.error(500,"删除失败"); + } + return ResultVOUtils.success("删除成功"); + } + } diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceBus.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceBus.java index 7cda873ef..70ba0d717 100644 --- a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceBus.java +++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceBus.java @@ -34,9 +34,9 @@ public class SysWorkplaceBus implements Serializable { @TableId(value = "id", type = IdType.AUTO) - private Integer id; + private Long id; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/req/basic/CargowWorkplaceRequest.java b/src/main/java/com/glxp/api/req/basic/CargowWorkplaceRequest.java index c84cc03ca..22d4b3c79 100644 --- a/src/main/java/com/glxp/api/req/basic/CargowWorkplaceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/CargowWorkplaceRequest.java @@ -16,7 +16,7 @@ public class CargowWorkplaceRequest extends ListPageRequest { private List documentTypeCodes; private Long workPlaceCode; private String code; - private String busKey; + private String keyWords; private String workKey; private String documentTypeCode; private Integer isPopular; @@ -28,6 +28,7 @@ public class CargowWorkplaceRequest extends ListPageRequest { private List collectWorkCodes; private List collectBusTypes; private List relBusIdFks; + private Long id; diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java index 7b1a44c0e..fae0172e8 100644 --- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java @@ -142,6 +142,7 @@ public class SysWorkplaceDocumentResponse { private Integer shipper; private Integer consignee; private Integer inAndOutType; + private String collectAndTypeCodes; public String getThrBusName() { diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplacePutRelResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplacePutRelResponse.java index 9036a00c9..a3f952d2b 100644 --- a/src/main/java/com/glxp/api/res/basic/SysWorkplacePutRelResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplacePutRelResponse.java @@ -10,9 +10,12 @@ import lombok.Data; @Data public class SysWorkplacePutRelResponse { + private Long id; private String collectName; private String busTypeName; private Long collectWorkPlaceCode; private String collectBusTypeCode; + //工位编码 + 业务类型code 拼接 + private String collectAndTypeCodes; } diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceDocumentDao.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceDocumentDao.xml index 884d36b55..317999690 100644 --- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceDocumentDao.xml +++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceDocumentDao.xml @@ -33,7 +33,8 @@ - select sw.workplaceName as collectName,swd.busName as busTypeName,sw.workplaceId as collectWorkPlaceCode,swd.documentTypeCode as collectBusTypeCode + select swpr.id, sw.workplaceName as collectName, + swd.busName as busTypeName, + sw.workplaceId as collectWorkPlaceCode, + swd.documentTypeCode as collectBusTypeCode, + CONCAT(sw.workplaceId,swd.documentTypeCode) as collectAndTypeCodes from sys_workplace_put_rel swpr left join sys_workplace sw on swpr.collectWorkCode = sw.workplaceId left join sys_workplace_document swd on swpr.collectBusType = swd.documentTypeCode @@ -10,6 +14,10 @@ AND swpr.workPlaceCode =#{workPlaceCode} + + and (sw.workplaceName like concat('%', #{keyWords}, '%') + or swd.busName like concat('%', #{keyWords}, '%')) +