chujinwang
/
chushangcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
ant 2024-07-19 17:49:02 +08:00
parent e467e83519 b4c09a46d4
commit 241047f5e9
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java
View File

@ -109,6 +109,7 @@ public class TerminalServiceImpl extends ServiceImpl<TerminalMapper, Terminal> i
for (Long terminalId : terminalIds) { for (Long terminalId : terminalIds) {
Terminal terminal = getById(terminalId); Terminal terminal = getById(terminalId);
terminal.setOccupy(i); terminal.setOccupy(i);
terminal.setVersion(0l);
baseMapper.updateById(terminal); baseMapper.updateById(terminal);
} }
} }

11
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java
View File

@ -600,6 +600,7 @@ public class WrkInfoServiceImpl extends ServiceImpl<WrkInfoMapper, WrkInfo> impl
wrkInfo.setWorkSource(query.getWorkSource()); wrkInfo.setWorkSource(query.getWorkSource());
wrkInfo.setTaskId(dispatch.getTaskId()); wrkInfo.setTaskId(dispatch.getTaskId());
wrkInfo.setLowerTaskId(dispatch.getLowerTaskId()); wrkInfo.setLowerTaskId(dispatch.getLowerTaskId());
wrkInfo.setVersion(0L);
// 处理时间 // 处理时间
//wrkInfo.setDisposeTime(query.getEndTime()); //wrkInfo.setDisposeTime(query.getEndTime());
// 业务员名字和客户经理? // 业务员名字和客户经理?
@ -613,21 +614,23 @@ public class WrkInfoServiceImpl extends ServiceImpl<WrkInfoMapper, WrkInfo> impl
Set<String> nickNames = StreamUtils.toSet(dispatch, DispatchDTO::getAccountManager); Set<String> nickNames = StreamUtils.toSet(dispatch, DispatchDTO::getAccountManager);
Result<Map<String, Long>> result = userFeignService.getIdByNicknames(nickNames, SecurityConstants.INNER); Result<Map<String, Long>> result = userFeignService.getIdByNicknames(nickNames, SecurityConstants.INNER);
if (result.isSuccess()) { if (result.isSuccess()) {
Map<String, Long> userIds = result.getData(); // Map<String, Long> userIds = result.getData();
for (DispatchDTO dispatchDTO : dispatch) { for (DispatchDTO dispatchDTO : dispatch) {
Long userId = userIds.get(dispatchDTO.getAccountManager()); // Long userId = userIds.get(dispatchDTO.getAccountManager());
Assert.notNull(userId, "【{}】未设置商户", dispatchDTO.getAccountManager()); // Assert.notNull(userId, "【{}】未设置商户", dispatchDTO.getAccountManager());
// 组装wrkinfo实体 // 组装wrkinfo实体
WrkInfo wrkInfo = makeWrkInfoEntity(dispatchDTO, query, userId, dispatchDTO.getAccountManager(), 0); WrkInfo wrkInfo = makeWrkInfoEntity(dispatchDTO, query, query.getUserId(), dispatchDTO.getAccountManager(), 0);
save(wrkInfo); save(wrkInfo);
//组装wrkterminal 实体 //组装wrkterminal 实体
WrkInfoTerminalRecord wrkInfoTerminalRecord = BeanUtil.copyProperties(dispatchDTO, WrkInfoTerminalRecord.class); WrkInfoTerminalRecord wrkInfoTerminalRecord = BeanUtil.copyProperties(dispatchDTO, WrkInfoTerminalRecord.class);
wrkInfoTerminalRecord.setWrkId(wrkInfo.getWrkId()); wrkInfoTerminalRecord.setWrkId(wrkInfo.getWrkId());
wrkInfoTerminalRecord.setVersion(0L);
wrkInfoTerminalRecordService.save(wrkInfoTerminalRecord); wrkInfoTerminalRecordService.save(wrkInfoTerminalRecord);
WrkInfoStoreRecord wrkInfoStoreRecord = BeanUtil.copyProperties(dispatchDTO, WrkInfoStoreRecord.class); WrkInfoStoreRecord wrkInfoStoreRecord = BeanUtil.copyProperties(dispatchDTO, WrkInfoStoreRecord.class);
wrkInfoStoreRecord.setWrkId(wrkInfo.getWrkId()); wrkInfoStoreRecord.setWrkId(wrkInfo.getWrkId());
wrkInfoStoreRecord.setDeptId(SecurityUtils.getDeptId()); wrkInfoStoreRecord.setDeptId(SecurityUtils.getDeptId());
wrkInfoStoreRecord.setStoreId(dispatchDTO.getStoreId()); wrkInfoStoreRecord.setStoreId(dispatchDTO.getStoreId());
wrkInfoStoreRecord.setVersion(0L);
wrkInfoStoreRecordService.save(wrkInfoStoreRecord); wrkInfoStoreRecordService.save(wrkInfoStoreRecord);
} }
} }

9
chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml
View File

@ -217,12 +217,19 @@
</if> </if>
<if test="query.nos != null and query.nos.size > 0"> <if test="query.nos != null and query.nos.size > 0">
AND t1.terminal_no in AND t1.store_no in
<foreach collection="query.nos" item="no" open="(" separator="," close=")"> <foreach collection="query.nos" item="no" open="(" separator="," close=")">
#{no} #{no}
</foreach> </foreach>
</if> </if>
<if test="query.terminalNos != null and query.terminalNos.size > 0">
AND t1.terminal_no in
<foreach collection="query.terminalNos" item="no" open="(" separator="," close=")">
#{no}
</foreach>
</if>
<if test="query.terminalIds != null and query.terminalIds.size > 0"> <if test="query.terminalIds != null and query.terminalIds.size > 0">
AND t1.terminal_id in AND t1.terminal_id in
<foreach collection="query.terminalIds" item="id" open="(" separator="," close=")"> <foreach collection="query.terminalIds" item="id" open="(" separator="," close=")">