From 0aa2dd71fa4b989838f89aff2cac82950a70097f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 22 八月 2024 18:10:48 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
index 227a194..7dcc045 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformGroupServiceImpl.java
@@ -58,11 +58,11 @@
)>0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ被鍨嬪垎缁勫凡缁忓垱寤猴紝璇疯繑鍥炲埛鏂伴〉闈㈡煡鐪嬶紒");
}
-
+ platformGroup.setStatus(Constants.ZERO);
platformGroup.setIsdeleted(Constants.ZERO);
platformGroup.setCreator(platformGroup.getLoginUserInfo().getId());
platformGroup.setCreateDate(new Date());
- platformGroup.setEditDate(platformGroup.getEditDate());
+ platformGroup.setEditDate(platformGroup.getCreateDate());
platformGroup.setEditor(platformGroup.getCreator());
platformGroupMapper.insert(platformGroup);
return platformGroup.getId();
@@ -125,8 +125,8 @@
)>0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ被鍨嬪垎缁勫凡缁忓垱寤猴紝璇疯繑鍥炲埛鏂伴〉闈㈡煡鐪嬶紒");
}
- platformGroup.setEditDate(platformGroup.getEditDate());
- platformGroup.setEditor(platformGroup.getCreator());
+ platformGroup.setEditDate(new Date());
+ platformGroup.setEditor(platformGroup.getLoginUserInfo().getId());
platformGroupMapper.updateById(platformGroup);
}
@@ -204,8 +204,9 @@
List<Platform> allPlatformList = platformJoinMapper.selectJoinList(Platform.class,
new MPJLambdaWrapper<Platform>()
.selectAll(Platform.class)
+ .select(" ( select count(1) from platform_job pj where t.id = pj.PLATFORM_ID and pj.STATUS = "+Constants.PlatformJobStatus.WORKING.getKey()+" ) as workStatus ")
.eq(Platform::getIsdeleted, Constants.ZERO)
- //TODO 寰呯‘璁ゆ湀鍙扮姸鎬佸瓧娈�
+ .eq(Platform::getStatus, Constants.ZERO)
.eq(Objects.nonNull(queryType)&&!Constants.equalsInteger(queryType,Constants.ZERO),Platform::getStatus,Constants.ZERO)
);
//澶勭悊鎴戠殑鏈堝彴淇℃伅 鏄惁閰嶇疆闅愯棌
--
Gitblit v1.9.3