From 820b698cbe950212b59a08ebcfccba5d52929c77 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 24 Sep 2024 19:23:40 +0800 Subject: [PATCH] =?UTF-8?q?9/24=20=E7=8E=B0=E5=9C=BA=E7=AE=A1=E7=90=86bug?= =?UTF-8?q?=E4=BC=98=E5=8C=961.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/SysWorkplaceController.java | 1 + .../glxp/api/res/basic/UserWorkResponse.java | 1 + .../api/service/auth/SysWorkplaceService.java | 18 +++++++++--------- .../service/collect/IoCollectOrderService.java | 5 ++++- .../collect/IoCollectOriginService.java | 4 ++-- .../mapper/basic/BasicCollectUserMapper.xml | 1 + .../mapper/basic/SysWorkplaceDocumentDao.xml | 7 ++++++- .../collect/IoCollectOrderBackupMapper.xml | 4 ++-- .../mapper/collect/IoCollectOrderMapper.xml | 10 ++++++++++ 9 files changed, 36 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java index f5d24a82f..2d63c9516 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java @@ -113,6 +113,7 @@ public class SysWorkplaceController extends BaseController { if (CollUtil.isNotEmpty(collect)) { request.setWorkPlaceIds(collect); } + request.setLimit(100); } List page = sysWorkplaceService.filterList(request); List reList = page.stream().map(s -> { diff --git a/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java b/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java index e0fb70e33..445dec802 100644 --- a/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java @@ -79,4 +79,5 @@ public class UserWorkResponse { + } diff --git a/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java b/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java index 75c7c0f80..a46e18705 100644 --- a/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java +++ b/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java @@ -66,15 +66,15 @@ public class SysWorkplaceService extends ServiceImpl page = sysWorkplaceDocumentService.filterListByWorkplace(request); - if (page.size() >0 ){ - throw new JsonException(500,"当前工位已作业，请解绑之后暂停工位"); - } - } +// if (sysWorkplace.getWorkplaceStatus() == 0 ){ +// //更改停用 判断是否含有业务类型 +// WorkBindBusTypeRequest request = new WorkBindBusTypeRequest(); +// request.setWorkplaceCode(sysWorkplace.getWorkplaceId()); +// List page = sysWorkplaceDocumentService.filterListByWorkplace(request); +// if (page.size() >0 ){ +// throw new JsonException(500,"当前工位已作业，请解绑之后暂停工位"); +// } +// } boolean b = this.updateById(sysWorkplace); if (!b){ return false; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index b8dfac443..baf50ea9e 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -521,7 +521,10 @@ public class IoCollectOrderService extends ServiceImpl bizList = collectOrder.getBizList(); diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java index 47f0f1a2e..b646f0fee 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java @@ -167,7 +167,7 @@ public class IoCollectOriginService { List ioCollectOrderBizOrigins = BeanCopyUtils.copyList(bizList, IoCollectOrderBizOrigin.class); collectOrderBizOriginService.updateBatchById(ioCollectOrderBizOrigins); }else { - thrOrder.setTagStatus(0); + thrOrder.setTagStatus(2); collectOrderOriginService.updateById(thrOrder); List ioCollectOrderBizOrigins = BeanCopyUtils.copyList(bizList, IoCollectOrderBizOrigin.class); @@ -207,4 +207,4 @@ public class IoCollectOriginService { } return null; } -} \ No newline at end of file +} diff --git a/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml index a4bb58935..90854895b 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml @@ -7,6 +7,7 @@ sw.invCode, sw.workplaceId, sw.constituencies, + sw.remake, au.userName, au.employeeName, sw.createTime as createTime, diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceDocumentDao.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceDocumentDao.xml index 19e748649..d73ac4ba9 100644 --- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceDocumentDao.xml +++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceDocumentDao.xml @@ -10,11 +10,15 @@ left join auth_warehouse aw on aw.code = sys_workplace_document.invCode left join basic_bussiness_type on sys_workplace_document.documentTypeCode = basic_bussiness_type.action left join thr_bustype_origin on thr_bustype_origin.action = sys_workplace_document.documentTypeCode - + left join sys_workplace_bus on sys_workplace_bus.busTypeCode = sys_workplace_document.documentTypeCode + left join sys_workplace on sys_workplace.workplaceId = sys_workplace_bus.workplaceCode AND documentTypeCode = #{documentTypeCode} + + AND sys_workplace.workplaceId = #{workplaceCode} + AND isPopular = #{isPopular} @@ -24,6 +28,7 @@ ) + GROUP BY sys_workplace_document.documentTypeCode ORDER BY sys_workplace_document.number diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml index e8c36897d..7667981c4 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml @@ -119,12 +119,12 @@ = DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S') + and icob.billTime >= DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S') ]]> diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml index 1226ef5b4..e62a2f8c4 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml @@ -130,6 +130,16 @@ AND ico.fromCorpName LIKE concat('%', #{fromCorpName}, '%') + + = DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S') + ]]> + + + + GROUP BY ico.billNo