From 8470e06b5ce5189162f9f6cd3f2cea7d14ad80af Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 28 四月 2025 10:37:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 38 --------------------------------------
1 files changed, 0 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..547151c 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
@@ -760,11 +760,7 @@
}
}
}
-
-
}
-
-
public void distanceSignIn(SignInDTO signInDTO , PlatformJob platformJob){
@@ -2459,42 +2455,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