From ee23b6732074f65aebc4ef57b0b0c781dbe575d8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 六月 2025 15:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index 1f540a2..4b0620a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -1628,7 +1628,7 @@
TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockResult = tmsService.lockStatusQuery(tmsLock);
if(lockResult!=null && lockResult.getCode()!=null && lockResult.getCode().equals("0")&& lockResult.getData()!=null ){
for(TmsLockStatusQueryResponse s : lockResult.getData()){
- if(StringUtils.isBlank(s.getContractNumber())){
+ if(StringUtils.isBlank(s.getOutDate())){
continue;
}
platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
@@ -1692,6 +1692,9 @@
if(lockResult!=null && lockResult.getCode()!=null && lockResult.getCode().equals("0")&& lockResult.getData()!=null ){
for(TmsLockStatusQueryResponse s : lockResult.getData()){
try {
+ if(StringUtils.isBlank(s.getOutDate())){
+ continue;
+ }
//寮傚父澶勭悊锛岃兘澶勭悊涓�涓槸涓�涓�
platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
.eq(PlatformWmsDetail::getContractNum,s.getContractNumber())
@@ -2446,7 +2449,7 @@
* @param jobIdList
*/
@Override
- public void dealJobFinish(List<Integer> jobIdList){
+ public void dealJobFinish(List<Integer> jobIdList,LoginUserInfo loginUserInfo){
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(jobIdList)){
List<PlatformJob> platformJobList = platformJobMapper.selectList(new QueryWrapper<PlatformJob>().lambda()
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
@@ -2459,6 +2462,7 @@
platformJobMapper.update(null,new UpdateWrapper<PlatformJob>().lambda()
.set(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey())
.set(PlatformJob::getDoneDate,new Date())
+ .set(PlatformJob::getEditor,loginUserInfo.getId())
.in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CONFIRM.getKey(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey(),Constants.PlatformJobStatus.WAIT_CALL.getKey())
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.in(PlatformJob::getId,platformJobList.stream().map(i->i.getId()).collect(Collectors.toList())));
--
Gitblit v1.9.3