From 07c74e14d85404b9d373ce7619274a9f05476815 Mon Sep 17 00:00:00 2001 From: Chujinwang <17638147107@163.com> Date: Fri, 19 Jul 2024 15:17:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B4=BE=E5=8D=95=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/TerminalMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml index e238851..a56ab2a 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml @@ -216,9 +216,9 @@ AND t1.task_id = #{query.taskId} - + AND t1.terminal_no in - + #{no} From 5f84334ae3a038134bcafaecaea74d6fd575da46 Mon Sep 17 00:00:00 2001 From: Chujinwang <17638147107@163.com> Date: Fri, 19 Jul 2024 15:19:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B4=BE=E5=8D=95=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=8A=A0=E5=95=86=E6=88=B7=E7=BC=96=E5=8F=B7=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/TerminalMapper.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml index a56ab2a..0e46a5c 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml @@ -216,6 +216,13 @@ AND t1.task_id = #{query.taskId} + + AND t1.store_no in + + #{no} + + + AND t1.terminal_no in From b4c09a46d4fd15471857187a5f3f52baeb9ab8ff Mon Sep 17 00:00:00 2001 From: Chujinwang <17638147107@163.com> Date: Fri, 19 Jul 2024 15:58:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B4=BE=E5=8D=95=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../terminal/service/impl/TerminalServiceImpl.java | 1 + .../work/service/impl/WrkInfoServiceImpl.java | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java index e71b249..0ac984d 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java @@ -109,6 +109,7 @@ public class TerminalServiceImpl extends ServiceImpl i for (Long terminalId : terminalIds) { Terminal terminal = getById(terminalId); terminal.setOccupy(i); + terminal.setVersion(0l); baseMapper.updateById(terminal); } } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java index c57195a..bfa55f4 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java @@ -600,6 +600,7 @@ public class WrkInfoServiceImpl extends ServiceImpl impl wrkInfo.setWorkSource(query.getWorkSource()); wrkInfo.setTaskId(dispatch.getTaskId()); wrkInfo.setLowerTaskId(dispatch.getLowerTaskId()); + wrkInfo.setVersion(0L); // 处理时间 //wrkInfo.setDisposeTime(query.getEndTime()); // 业务员名字和客户经理? @@ -613,21 +614,23 @@ public class WrkInfoServiceImpl extends ServiceImpl impl Set nickNames = StreamUtils.toSet(dispatch, DispatchDTO::getAccountManager); Result> result = userFeignService.getIdByNicknames(nickNames, SecurityConstants.INNER); if (result.isSuccess()) { - Map userIds = result.getData(); +// Map userIds = result.getData(); for (DispatchDTO dispatchDTO : dispatch) { - Long userId = userIds.get(dispatchDTO.getAccountManager()); - Assert.notNull(userId, "【{}】未设置商户", dispatchDTO.getAccountManager()); +// Long userId = userIds.get(dispatchDTO.getAccountManager()); +// Assert.notNull(userId, "【{}】未设置商户", dispatchDTO.getAccountManager()); // 组装wrkinfo实体 - WrkInfo wrkInfo = makeWrkInfoEntity(dispatchDTO, query, userId, dispatchDTO.getAccountManager(), 0); + WrkInfo wrkInfo = makeWrkInfoEntity(dispatchDTO, query, query.getUserId(), dispatchDTO.getAccountManager(), 0); save(wrkInfo); //组装wrkterminal 实体 WrkInfoTerminalRecord wrkInfoTerminalRecord = BeanUtil.copyProperties(dispatchDTO, WrkInfoTerminalRecord.class); wrkInfoTerminalRecord.setWrkId(wrkInfo.getWrkId()); + wrkInfoTerminalRecord.setVersion(0L); wrkInfoTerminalRecordService.save(wrkInfoTerminalRecord); WrkInfoStoreRecord wrkInfoStoreRecord = BeanUtil.copyProperties(dispatchDTO, WrkInfoStoreRecord.class); wrkInfoStoreRecord.setWrkId(wrkInfo.getWrkId()); wrkInfoStoreRecord.setDeptId(SecurityUtils.getDeptId()); wrkInfoStoreRecord.setStoreId(dispatchDTO.getStoreId()); + wrkInfoStoreRecord.setVersion(0L); wrkInfoStoreRecordService.save(wrkInfoStoreRecord); } }