From 28aaf2ffa1dbb860a292ba330a7e9362e60e7832 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期五, 12 七月 2024 16:41:03 +0800
Subject: [PATCH] update
---
assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssPlanPersonServiceImpl.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssPlanPersonServiceImpl.java b/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssPlanPersonServiceImpl.java
index 3d3f27b..5b9beeb 100644
--- a/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssPlanPersonServiceImpl.java
+++ b/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssPlanPersonServiceImpl.java
@@ -1,5 +1,6 @@
package com.gkhy.assess.system.service.impl;
+import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.gkhy.assess.common.enums.DeleteFlagEnum;
@@ -17,7 +18,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -48,13 +52,16 @@
return baseMapper.insert(planPerson);
}
-
@Override
public void checkPersonUnique(AssPlanPerson planPerson) {
+ if(planPerson.getPlayRole()==null){
+ planPerson.setPlayRole(PlayRoleEnum.PROJECT_MEMBER.getCode());
+ }
LambdaQueryWrapper<AssPlanPerson> lambdaQueryWrapper = Wrappers.<AssPlanPerson>lambdaQuery()
.eq(AssPlanPerson::getPersonId, planPerson.getPersonId())
.eq(AssPlanPerson::getDelFlag, DeleteFlagEnum.UN_DELETE)
- .eq(AssPlanPerson::getProjectId, planPerson.getProjectId());
+ .eq(AssPlanPerson::getProjectId, planPerson.getProjectId())
+ .eq(AssPlanPerson::getPlayRole,planPerson.getPlayRole());
if(planPerson.getId()!=null){
lambdaQueryWrapper.ne(AssPlanPerson::getId,planPerson.getId());
}
@@ -84,6 +91,11 @@
}
@Override
+ public int getMajorPlanPersonCountByProject(Long projectId) {
+ return baseMapper.getMajorPlanPersonCountByProject(projectId);
+ }
+
+ @Override
public int editPlanPerson(AssPlanPerson planPerson) {
projectService.checkUserAllowed(planPerson.getProjectId());
if(planPerson.getPersonId()!=null){
@@ -104,10 +116,12 @@
}
@Override
- public int deletePlanPersonByPersonId(Long personId) {
+ public int deletePlanPersonByPersonId(Long personId,Long projectId,Integer playCode) {
return baseMapper.update(null,Wrappers.<AssPlanPerson>lambdaUpdate()
.set(AssPlanPerson::getDelFlag,DeleteFlagEnum.DELETED.getCode())
.set(AssPlanPerson::getUpdateBy,ShiroUtils.getSysUser().getUsername())
- .eq(AssPlanPerson::getPersonId,personId));
+ .eq(AssPlanPerson::getPersonId,personId)
+ .eq(AssPlanPerson::getProjectId,projectId)
+ .eq(AssPlanPerson::getPlayRole,playCode));
}
}
--
Gitblit v1.9.2