From e5068dce50b56fe0e56128b91951e4d92dcf8307 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 11 十月 2024 14:48:22 +0800 Subject: [PATCH] 最新版本 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java index 10e2a89..c3a8437 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPlatformsServiceImpl.java @@ -1,6 +1,7 @@ package com.doumee.service.business.impl.hksync; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; @@ -13,10 +14,12 @@ import com.doumee.core.utils.Constants; import com.doumee.core.utils.DateUtil; import com.doumee.dao.business.PlatformDeviceMapper; +import com.doumee.dao.business.PlatformJobMapper; import com.doumee.dao.business.PlatformMapper; import com.doumee.dao.business.model.Device; import com.doumee.dao.business.model.Platform; import com.doumee.dao.business.model.PlatformDevice; +import com.doumee.dao.business.model.PlatformJob; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,6 +38,8 @@ public class HkSyncPlatformsServiceImpl extends HkSyncBaseServiceImpl { @Autowired private PlatformMapper platformMapper; + @Autowired + private PlatformJobMapper platformJobMapper; @Autowired private PlatformDeviceMapper platformDeviceMapper; @@ -65,9 +70,23 @@ getDataChangeList(allList,allHkList,addList,deviceList,editList,deleteList,date); if(deleteList.size()>0){ //閫昏緫鍒犻櫎 + List<Integer> platIds = new ArrayList<>(); for(Platform d : deleteList){ platformMapper.updateById(d); + platIds.add(d.getId()); } + //鏇存柊鍒犻櫎鐨勬湀鍙颁俊鎭垹姝e湪鎵ц鐨勪綔涓氱姸鎬佷负銆愬緟绛惧埌銆戠姸鎬� + platformJobMapper.update(null, new UpdateWrapper<PlatformJob>().lambda() + .eq(PlatformJob::getIsdeleted,Constants.ZERO) + .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.WART_SIGN_IN.getKey() + ,Constants.PlatformJobStatus.WAIT_CONFIRM.getKey() + ,Constants.PlatformJobStatus.DONE.getKey() + ,Constants.PlatformJobStatus.LEAVED.getKey() + ,Constants.PlatformJobStatus.CANCEL.getKey() ) + .in(PlatformJob::getPlatformId,platIds) + .set(PlatformJob::getPlatformId,null) + .set(PlatformJob::getStatus,Constants.PlatformJobStatus.WART_SIGN_IN.getKey()) + ); } if(deviceList.size()>0){ platformDeviceMapper.insert(deviceList); -- Gitblit v1.9.3