From 8bf846c4c3870d64a33cebc1c168421235af7707 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 27 八月 2024 09:18:31 +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 | 21 ++++++++++++++++-----
1 files changed, 16 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..05ad10f 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
@@ -6,19 +6,24 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformGroupMapper;
import com.doumee.dao.business.PlatformShowParamMapper;
+import com.doumee.dao.business.join.PlatformJobJoinMapper;
import com.doumee.dao.business.join.PlatformJoinMapper;
import com.doumee.dao.business.model.Platform;
import com.doumee.dao.business.model.PlatformGroup;
+import com.doumee.dao.business.model.PlatformJob;
import com.doumee.dao.business.model.PlatformShowParam;
import com.doumee.service.business.PlatformGroupService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.service.business.PlatformJobService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.extern.java.Log;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -45,6 +50,9 @@
@Autowired
private PlatformShowParamMapper platformShowParamMapper;
+ @Autowired
+ private PlatformJobJoinMapper platformJobJoinMapper;
+
@Override
public Integer create(PlatformGroup platformGroup) {
if(platformGroup.getType() ==null
@@ -58,11 +66,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 +133,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 +212,8 @@
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(Objects.nonNull(queryType)&&!Constants.equalsInteger(queryType,Constants.ZERO),Platform::getStatus,Constants.ZERO)
);
//澶勭悊鎴戠殑鏈堝彴淇℃伅 鏄惁閰嶇疆闅愯棌
@@ -239,4 +247,7 @@
}
+
+
+
}
--
Gitblit v1.9.3