From 4a8e93b2b6433f34d066171b41f9c4c11617756f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 29 四月 2025 16:21:54 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 51 +++++++++++++--------------------------------------
1 files changed, 13 insertions(+), 38 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 7469b7d..dbd6259 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
@@ -131,6 +131,8 @@
@Autowired
private PlatformWarnEventServiceImpl platformWarnEventService;
@Autowired
+ private PlatformWarnEventMapper platformWarnEventMapper;
+ @Autowired
private MemberMapper memberMapper;
@Autowired
private WxNoticeConfigMapper wxNoticeConfigMapper;
@@ -760,11 +762,7 @@
}
}
}
-
-
}
-
-
public void distanceSignIn(SignInDTO signInDTO , PlatformJob platformJob){
@@ -1145,6 +1143,11 @@
if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.DONE.getKey())){
//濡傛灉宸蹭笅鍙戞垚鍔燂紝鏍囪宸叉巿鏉冪鍥姸鎬�
platformJob.setStatus(Constants.PlatformJobStatus.AUTHED_LEAVE.getKey());
+ //鍒犻櫎鎶ヨ淇℃伅
+ platformWarnEventMapper.update(new UpdateWrapper<PlatformWarnEvent>().lambda()
+ .set(PlatformWarnEvent::getIsdeleted,Constants.ONE)
+ .eq(PlatformWarnEvent::getPlatformId,platformJob.getId())
+ );
}
}else{
platformJob.setInHkstatus(Constants.THREE);
@@ -1609,6 +1612,12 @@
//瀛樺偍鎿嶄綔鏃ュ織
savePlatformLog(Constants.PlatformJobLogType.DONE.getKey(),oldPlatformJob,platformJob ,
Constants.PlatformJobLogType.DONE.getInfo());
+
+ //鍒犻櫎鎶ヨ淇℃伅
+ platformWarnEventMapper.update(new UpdateWrapper<PlatformWarnEvent>().lambda()
+ .set(PlatformWarnEvent::getIsdeleted,Constants.ONE)
+ .eq(PlatformWarnEvent::getPlatformId,platformJob.getId())
+ );
if(Constants.equalsInteger(platformJob.getType(),Constants.THREE)){
// 澶栧崗杞﹁璐� 鏌ヨTMS 鐢靛瓙閿佹儏鍐�
@@ -2459,42 +2468,8 @@
}
}
- }
-
-
- @Override
- @Transactional(rollbackFor = {Exception.class,BusinessException.class})
- public PlatformJob restoreWork(JobOperateDTO jobOperateDTO){
- if(Objects.isNull(jobOperateDTO)
- || Objects.isNull(jobOperateDTO.getJobId())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST);
- }
- PlatformJob platformJob = platformJobMapper.selectById(jobOperateDTO.getJobId());
- if(Objects.isNull(platformJob)||Constants.equalsInteger(platformJob.getIsdeleted(),Constants.ONE)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY);
- }
- if(!Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.EXCEPTION.getKey())){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,涓氬姟鐘舵�佸凡娴佽浆锛�");
- }
- Platform platform = platformJoinMapper.selectById(platformJob.getPlatformId());
- if(Objects.isNull(platform)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鏈堝彴淇℃伅");
- }
- PlatformJob oldPlatformJob = new PlatformJob();
- BeanUtils.copyProperties(platformJob,oldPlatformJob);
- if(Objects.isNull(platformJob.getStartDate())){
- platformJob.setStartDate(new Date());
- }
- platformJob.setStatus(Constants.PlatformJobStatus.WORKING.getKey());
- platformJob.setEditDate(new Date());
- platformJobMapper.updateById(platformJob);
-
- //瀛樺偍鎿嶄綔鏃ュ織
- savePlatformLog(Constants.PlatformJobLogType.WORKING.getKey(),oldPlatformJob,platformJob,
- Constants.PlatformJobLogType.WORKING.getInfo().replace("{data}",platform.getName()));
- return platformJob;
}
--
Gitblit v1.9.3