平台件-认证清单
This commit is contained in:
+3
-3
@@ -8,7 +8,7 @@ import com.jero.common.aspect.annotation.AutoLog;
|
|||||||
import com.jero.common.system.base.controller.JeroController;
|
import com.jero.common.system.base.controller.JeroController;
|
||||||
import com.jero.common.system.vo.DictModel;
|
import com.jero.common.system.vo.DictModel;
|
||||||
import com.jero.modules.project.entity.ProjectLibraryBase;
|
import com.jero.modules.project.entity.ProjectLibraryBase;
|
||||||
import com.jero.modules.platform.service.IPlatformIProjectLibraryBaseService;
|
import com.jero.modules.platform.service.IPlatformProjectLibraryBaseService;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -44,9 +44,9 @@ import java.util.Map;
|
|||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/platform/projectLibraryBase")
|
@RequestMapping("/platform/projectLibraryBase")
|
||||||
@Slf4j
|
@Slf4j
|
||||||
public class PlatformProjectLibraryBaseController extends JeroController<ProjectLibraryBase, IPlatformIProjectLibraryBaseService> {
|
public class PlatformProjectLibraryBaseController extends JeroController<ProjectLibraryBase, IPlatformProjectLibraryBaseService> {
|
||||||
@Autowired
|
@Autowired
|
||||||
private IPlatformIProjectLibraryBaseService platformIProjectLibraryBaseService;
|
private IPlatformProjectLibraryBaseService platformIProjectLibraryBaseService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页列表查询
|
* 分页列表查询
|
||||||
|
|||||||
+1
-1
@@ -20,7 +20,7 @@ import java.util.Map;
|
|||||||
* @Date: 2022-04-11
|
* @Date: 2022-04-11
|
||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
public interface IPlatformIProjectLibraryBaseService extends IService<ProjectLibraryBase> {
|
public interface IPlatformProjectLibraryBaseService extends IService<ProjectLibraryBase> {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 保存
|
* 保存
|
||||||
+21
-27
@@ -20,7 +20,6 @@ import com.jero.common.system.vo.LoginUser;
|
|||||||
import com.jero.common.util.DateUtils;
|
import com.jero.common.util.DateUtils;
|
||||||
import com.jero.common.util.oss.CosBootUtil;
|
import com.jero.common.util.oss.CosBootUtil;
|
||||||
import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO;
|
import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO;
|
||||||
import com.jero.modules.authDummy.service.IAuthDummyInventoryBaseEOService;
|
|
||||||
import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService;
|
import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService;
|
||||||
import com.jero.modules.document.entity.BussDocumentLibraryEO;
|
import com.jero.modules.document.entity.BussDocumentLibraryEO;
|
||||||
import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper;
|
import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper;
|
||||||
@@ -31,6 +30,11 @@ import com.jero.modules.feishu.enums.TemplateInfoEnum2;
|
|||||||
import com.jero.modules.feishu.service.IFeishuService;
|
import com.jero.modules.feishu.service.IFeishuService;
|
||||||
import com.jero.modules.oss.entity.OSSFile;
|
import com.jero.modules.oss.entity.OSSFile;
|
||||||
import com.jero.modules.oss.service.IOSSFileService;
|
import com.jero.modules.oss.service.IOSSFileService;
|
||||||
|
import com.jero.modules.platform.mapper.PlatformProjectCertificationInventoryEOMapper;
|
||||||
|
import com.jero.modules.platform.mapper.PlatformProjectLibraryBaseMapper;
|
||||||
|
import com.jero.modules.platform.service.IPlatformProjectCertificationInventoryEOService;
|
||||||
|
import com.jero.modules.platform.service.IPlatformProjectLawsInventoryEOService;
|
||||||
|
import com.jero.modules.platform.service.IPlatformProjectLibraryBaseService;
|
||||||
import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEO;
|
import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEO;
|
||||||
import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOEn;
|
import com.jero.modules.project.entity.ProjectCertificationInventoryDutyEnginnerEOEn;
|
||||||
import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
|
import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
|
||||||
@@ -54,16 +58,11 @@ import com.jero.modules.project.enums.ReviewResultEnum;
|
|||||||
import com.jero.modules.project.enums.RoleRelModelTypeEnum;
|
import com.jero.modules.project.enums.RoleRelModelTypeEnum;
|
||||||
import com.jero.modules.project.enums.TaskAffirmStatusEnum;
|
import com.jero.modules.project.enums.TaskAffirmStatusEnum;
|
||||||
import com.jero.modules.project.enums.TaskStatusEnum;
|
import com.jero.modules.project.enums.TaskStatusEnum;
|
||||||
import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
|
|
||||||
import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper;
|
import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper;
|
||||||
import com.jero.modules.project.service.IProjectCertificationInventoryLogEOService;
|
import com.jero.modules.project.service.IProjectCertificationInventoryLogEOService;
|
||||||
import com.jero.modules.project.service.IProjectLibraryBaseService;
|
|
||||||
import com.jero.modules.project.service.IProjectLibraryRoleRelEOService;
|
import com.jero.modules.project.service.IProjectLibraryRoleRelEOService;
|
||||||
import com.jero.modules.project.service.IProjectRelatedPersonnelService;
|
import com.jero.modules.project.service.IProjectRelatedPersonnelService;
|
||||||
import com.jero.modules.project.service.IProjectUserPermissionService;
|
import com.jero.modules.project.service.IProjectUserPermissionService;
|
||||||
import com.jero.modules.platform.mapper.PlatformProjectCertificationInventoryEOMapper;
|
|
||||||
import com.jero.modules.platform.service.IPlatformProjectCertificationInventoryEOService;
|
|
||||||
import com.jero.modules.platform.service.IPlatformProjectLawsInventoryEOService;
|
|
||||||
import com.jero.modules.split.common.FileUnZip;
|
import com.jero.modules.split.common.FileUnZip;
|
||||||
import com.jero.modules.system.entity.SysCategory;
|
import com.jero.modules.system.entity.SysCategory;
|
||||||
import com.jero.modules.system.entity.SysDictItem;
|
import com.jero.modules.system.entity.SysDictItem;
|
||||||
@@ -73,7 +72,6 @@ import com.jero.modules.system.enums.ProjectRoleEnum;
|
|||||||
import com.jero.modules.system.enums.SysCategoryValueTypeEnum;
|
import com.jero.modules.system.enums.SysCategoryValueTypeEnum;
|
||||||
import com.jero.modules.system.mapper.SysCategoryMapper;
|
import com.jero.modules.system.mapper.SysCategoryMapper;
|
||||||
import com.jero.modules.system.mapper.SysRoleMapper;
|
import com.jero.modules.system.mapper.SysRoleMapper;
|
||||||
import com.jero.modules.system.mapper.SysUserMapper;
|
|
||||||
import com.jero.modules.system.service.IProjectUserDutyTerritoryService;
|
import com.jero.modules.system.service.IProjectUserDutyTerritoryService;
|
||||||
import com.jero.modules.system.service.ISysCategoryService;
|
import com.jero.modules.system.service.ISysCategoryService;
|
||||||
import com.jero.modules.system.service.ISysDictItemService;
|
import com.jero.modules.system.service.ISysDictItemService;
|
||||||
@@ -168,7 +166,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
|||||||
@Autowired
|
@Autowired
|
||||||
private SysDictItemServiceImpl sysDictItemServiceImpl;
|
private SysDictItemServiceImpl sysDictItemServiceImpl;
|
||||||
@Autowired
|
@Autowired
|
||||||
private IProjectLibraryBaseService projectLibraryBaseService;
|
private IPlatformProjectLibraryBaseService platformProjectLibraryBaseService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private IProcessInfoEOService processInfoEOService;
|
private IProcessInfoEOService processInfoEOService;
|
||||||
@Autowired
|
@Autowired
|
||||||
@@ -182,8 +180,6 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
|||||||
@Autowired
|
@Autowired
|
||||||
private IFeishuService feishuService;
|
private IFeishuService feishuService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private IAuthDummyInventoryBaseEOService authDummyInventoryBaseEOService;
|
|
||||||
@Autowired
|
|
||||||
private IAuthDummyInventoryInfoEOService authDummyInventoryInfoEOService;
|
private IAuthDummyInventoryInfoEOService authDummyInventoryInfoEOService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private IProjectCertificationInventoryLogEOService projectCertificationInventoryLogEOService;
|
private IProjectCertificationInventoryLogEOService projectCertificationInventoryLogEOService;
|
||||||
@@ -200,7 +196,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
|||||||
private IPlatformProjectLawsInventoryEOService platformProjectLawsInventoryEOService;
|
private IPlatformProjectLawsInventoryEOService platformProjectLawsInventoryEOService;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private ProjectLibraryBaseMapper projectLibraryBaseMapper;
|
private PlatformProjectLibraryBaseMapper platformProjectLibraryBaseMapper;
|
||||||
|
|
||||||
|
|
||||||
@Value(value = "${jero.backUrl}")
|
@Value(value = "${jero.backUrl}")
|
||||||
@@ -222,8 +218,6 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
|||||||
@Autowired
|
@Autowired
|
||||||
private IOSSFileService iOSSFileService;
|
private IOSSFileService iOSSFileService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private SysUserMapper sysUserMapper;
|
|
||||||
@Autowired
|
|
||||||
private IProjectLibraryRoleRelEOService projectLibraryRoleRelEOService;
|
private IProjectLibraryRoleRelEOService projectLibraryRoleRelEOService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private IProcessHistoryEOService processHistoryEOService;
|
private IProcessHistoryEOService processHistoryEOService;
|
||||||
@@ -360,7 +354,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
|||||||
//获取当前项目库id的studio工程师和认证工程师
|
//获取当前项目库id的studio工程师和认证工程师
|
||||||
List<String> studionList = new ArrayList<>();
|
List<String> studionList = new ArrayList<>();
|
||||||
List<String> certificationEngineerList = new ArrayList<>();
|
List<String> certificationEngineerList = new ArrayList<>();
|
||||||
List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseService.queryById(projectId, cut);
|
List<ProjectLibraryBase> projectLibraryBases = platformProjectLibraryBaseService.queryById(projectId, cut);
|
||||||
for(ProjectLibraryBase projectLibraryBase : projectLibraryBases){
|
for(ProjectLibraryBase projectLibraryBase : projectLibraryBases){
|
||||||
studionList.add(projectLibraryBase.getStudioEngineer());
|
studionList.add(projectLibraryBase.getStudioEngineer());
|
||||||
|
|
||||||
@@ -460,7 +454,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
|||||||
}).collect(Collectors.toList());
|
}).collect(Collectors.toList());
|
||||||
|
|
||||||
if(CollectionUtils.isNotEmpty(oldPciEos)){
|
if(CollectionUtils.isNotEmpty(oldPciEos)){
|
||||||
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId());
|
ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId());
|
||||||
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
|
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
|
||||||
int role = checkUserRole(oldPciEos.get(0).getProjectLibraryId(),currentUser.getId());
|
int role = checkUserRole(oldPciEos.get(0).getProjectLibraryId(),currentUser.getId());
|
||||||
for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) {
|
for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) {
|
||||||
@@ -518,7 +512,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
|||||||
}).collect(Collectors.toList());
|
}).collect(Collectors.toList());
|
||||||
|
|
||||||
if(CollectionUtils.isNotEmpty(oldPciEos)){
|
if(CollectionUtils.isNotEmpty(oldPciEos)){
|
||||||
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId());
|
ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId());
|
||||||
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
|
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
|
||||||
int role = checkUserRole(oldPciEos.get(0).getProjectLibraryId(),currentUser.getId());
|
int role = checkUserRole(oldPciEos.get(0).getProjectLibraryId(),currentUser.getId());
|
||||||
for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) {
|
for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) {
|
||||||
@@ -773,7 +767,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
|||||||
}).collect(Collectors.toList());
|
}).collect(Collectors.toList());
|
||||||
|
|
||||||
if(CollectionUtils.isNotEmpty(oldPciEos)){
|
if(CollectionUtils.isNotEmpty(oldPciEos)){
|
||||||
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId());
|
ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId());
|
||||||
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
|
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
|
||||||
// 同步更新待办中心-流程明细截止日期
|
// 同步更新待办中心-流程明细截止日期
|
||||||
this.syncProcessInfoDetailEndTime(newEndTime, oldPciEos);
|
this.syncProcessInfoDetailEndTime(newEndTime, oldPciEos);
|
||||||
@@ -1023,7 +1017,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
|||||||
// }).collect(Collectors.toList());
|
// }).collect(Collectors.toList());
|
||||||
//
|
//
|
||||||
// if (CollectionUtils.isNotEmpty(pciEoListTemp)) {
|
// if (CollectionUtils.isNotEmpty(pciEoListTemp)) {
|
||||||
// ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(pciEoListTemp.get(0).getProjectLibraryId());
|
// ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(pciEoListTemp.get(0).getProjectLibraryId());
|
||||||
// if(ObjectUtils.isNotEmpty(projectLibraryBase)){
|
// if(ObjectUtils.isNotEmpty(projectLibraryBase)){
|
||||||
// List<String> userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
|
// List<String> userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
|
||||||
// List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
|
// List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
|
||||||
@@ -1094,7 +1088,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
|||||||
String contentEn){
|
String contentEn){
|
||||||
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
|
||||||
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectCertificationInventoryEOS.get(0).getProjectLibraryId());
|
ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectCertificationInventoryEOS.get(0).getProjectLibraryId());
|
||||||
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
|
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
|
||||||
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
|
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
|
||||||
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
|
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
|
||||||
@@ -1555,7 +1549,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 获取项目信息,获取认证工程师,给认证工程师分配待办任务
|
// 获取项目信息,获取认证工程师,给认证工程师分配待办任务
|
||||||
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
|
ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
|
||||||
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
|
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
|
||||||
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
|
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
|
||||||
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
|
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
|
||||||
@@ -1701,7 +1695,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
|||||||
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
|
||||||
//项目详情中取R&H Studio和认证工程师
|
//项目详情中取R&H Studio和认证工程师
|
||||||
List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseService.queryById(projectLibraryId,null);
|
List<ProjectLibraryBase> projectLibraryBases = platformProjectLibraryBaseService.queryById(projectLibraryId,null);
|
||||||
String certificationEngineerName = "";
|
String certificationEngineerName = "";
|
||||||
if(projectLibraryBases.size() != 0){
|
if(projectLibraryBases.size() != 0){
|
||||||
certificationEngineerName = projectLibraryBases.get(0).getCertificationEngineerName();
|
certificationEngineerName = projectLibraryBases.get(0).getCertificationEngineerName();
|
||||||
@@ -2216,7 +2210,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
|||||||
}
|
}
|
||||||
|
|
||||||
String projectLibraryId = json.getString("projectLibraryId");
|
String projectLibraryId = json.getString("projectLibraryId");
|
||||||
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
|
ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
|
||||||
if(ObjectUtils.isEmpty(projectLibraryBase)){
|
if(ObjectUtils.isEmpty(projectLibraryBase)){
|
||||||
throw new JeroBootException("无法获取项目库信息,项目库id为:" + projectLibraryId + " 请联系管理员!");
|
throw new JeroBootException("无法获取项目库信息,项目库id为:" + projectLibraryId + " 请联系管理员!");
|
||||||
}
|
}
|
||||||
@@ -3546,7 +3540,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
|||||||
String operatorType = json.getString("operatorType");
|
String operatorType = json.getString("operatorType");
|
||||||
|
|
||||||
String projectLibraryId = json.getString("projectLibraryId");
|
String projectLibraryId = json.getString("projectLibraryId");
|
||||||
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
|
ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
|
||||||
if(ObjectUtils.isEmpty(projectLibraryBase)){
|
if(ObjectUtils.isEmpty(projectLibraryBase)){
|
||||||
throw new JeroBootException("无法获取项目库信息,项目库id为:" + projectLibraryId + " 请联系管理员!");
|
throw new JeroBootException("无法获取项目库信息,项目库id为:" + projectLibraryId + " 请联系管理员!");
|
||||||
}
|
}
|
||||||
@@ -3689,7 +3683,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
|||||||
String transferUserId = json.getString("transferUserId");
|
String transferUserId = json.getString("transferUserId");
|
||||||
SysUser transferUserInfo = this.sysUserService.getById(transferUserId);
|
SysUser transferUserInfo = this.sysUserService.getById(transferUserId);
|
||||||
|
|
||||||
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
|
ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
|
||||||
if(ObjectUtils.isEmpty(projectLibraryBase)){
|
if(ObjectUtils.isEmpty(projectLibraryBase)){
|
||||||
throw new JeroBootException("无法获取项目库信息,项目库id为:" + projectLibraryId + " 请联系管理员!");
|
throw new JeroBootException("无法获取项目库信息,项目库id为:" + projectLibraryId + " 请联系管理员!");
|
||||||
}
|
}
|
||||||
@@ -3832,7 +3826,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
|||||||
}
|
}
|
||||||
|
|
||||||
String projectLibraryId = json.getString("projectLibraryId");
|
String projectLibraryId = json.getString("projectLibraryId");
|
||||||
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
|
ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
|
||||||
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
|
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
|
||||||
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
|
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
|
||||||
if(ObjectUtils.isEmpty(projectLibraryBase)){
|
if(ObjectUtils.isEmpty(projectLibraryBase)){
|
||||||
@@ -5813,7 +5807,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
|||||||
if(CollectionUtils.isNotEmpty(pciList)){
|
if(CollectionUtils.isNotEmpty(pciList)){
|
||||||
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
String projectLibraryId = pciList.get(0).getProjectLibraryId();
|
String projectLibraryId = pciList.get(0).getProjectLibraryId();
|
||||||
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
|
ProjectLibraryBase projectLibraryBase = this.platformProjectLibraryBaseService.selectById(projectLibraryId);
|
||||||
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
|
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
|
||||||
List<SysUser> studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(",")));
|
List<SysUser> studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(",")));
|
||||||
|
|
||||||
@@ -6830,7 +6824,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
|
|||||||
QueryWrapper<ProjectLibraryBase> projectLibraryBaseQueryWrapper = new QueryWrapper<>();
|
QueryWrapper<ProjectLibraryBase> projectLibraryBaseQueryWrapper = new QueryWrapper<>();
|
||||||
projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLibraryId);
|
projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId, projectLibraryId);
|
||||||
projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getStudioEngineer, currentUserId);
|
projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getStudioEngineer, currentUserId);
|
||||||
Integer projectLibrayBaseCount = projectLibraryBaseMapper.selectCount(projectLibraryBaseQueryWrapper);
|
Integer projectLibrayBaseCount = platformProjectLibraryBaseMapper.selectCount(projectLibraryBaseQueryWrapper);
|
||||||
if (projectLibrayBaseCount > 0) {
|
if (projectLibrayBaseCount > 0) {
|
||||||
result = Integer.parseInt(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue());
|
result = Integer.parseInt(com.jero.modules.project.enums.ProjectRoleEnum.STUDIO_ENGINEER.getValue());
|
||||||
if(result == -1){
|
if(result == -1){
|
||||||
|
|||||||
+2
-2
@@ -25,7 +25,7 @@ import com.jero.modules.feishu.enums.TemplateInfoEnum2;
|
|||||||
import com.jero.modules.ota.service.impl.OtaManageApplyEOServiceImpl;
|
import com.jero.modules.ota.service.impl.OtaManageApplyEOServiceImpl;
|
||||||
import com.jero.modules.platform.mapper.PlatformProjectLawsInventoryEOMapper;
|
import com.jero.modules.platform.mapper.PlatformProjectLawsInventoryEOMapper;
|
||||||
import com.jero.modules.platform.mapper.PlatformProjectLibraryBaseMapper;
|
import com.jero.modules.platform.mapper.PlatformProjectLibraryBaseMapper;
|
||||||
import com.jero.modules.platform.service.IPlatformIProjectLibraryBaseService;
|
import com.jero.modules.platform.service.IPlatformProjectLibraryBaseService;
|
||||||
import com.jero.modules.platform.service.IPlatformProjectCertificationInventoryEOService;
|
import com.jero.modules.platform.service.IPlatformProjectCertificationInventoryEOService;
|
||||||
import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
|
import com.jero.modules.project.entity.ProjectCertificationInventoryEO;
|
||||||
import com.jero.modules.project.entity.ProjectLawsInventoryEO;
|
import com.jero.modules.project.entity.ProjectLawsInventoryEO;
|
||||||
@@ -122,7 +122,7 @@ import java.util.stream.Collectors;
|
|||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformProjectLibraryBaseMapper, ProjectLibraryBase> implements IPlatformIProjectLibraryBaseService {
|
public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformProjectLibraryBaseMapper, ProjectLibraryBase> implements IPlatformProjectLibraryBaseService {
|
||||||
@Autowired
|
@Autowired
|
||||||
private PlatformProjectLibraryBaseMapper platformProjectLibraryBaseMapper;
|
private PlatformProjectLibraryBaseMapper platformProjectLibraryBaseMapper;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user