From e7afed8cdb301a311dbad5ed23c7ff9f826b2c48 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: Wed, 30 Oct 2024 11:11:06 +0800
Subject: [PATCH] update import
---
assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssProcessAuditServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssProcessAuditServiceImpl.java b/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssProcessAuditServiceImpl.java
index a6f1b86..ee6bf7b 100644
--- a/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssProcessAuditServiceImpl.java
+++ b/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssProcessAuditServiceImpl.java
@@ -41,7 +41,7 @@
Long projectId=processAudit.getProjectId();
projectService.checkUserAllowed(projectId);
checkProcessAuditCount(projectId);
- planPersonService.checkPersonUnique(new AssPlanPerson().setPersonId(processAudit.getProcessLeaderId()).setProjectId(projectId));
+ // planPersonService.checkPersonUnique(new AssPlanPerson().setPersonId(processAudit.getProcessLeaderId()).setProjectId(projectId));
//校验项目状态
projectService.checkReportProgress(projectId, ReportProgressEnum.CONCLUSION);
processAudit.setCreateBy(ShiroUtils.getSysUser().getUsername());
@@ -74,9 +74,9 @@
processAudit.setUpdateBy(ShiroUtils.getSysUser().getUsername());
int row=baseMapper.updateById(processAudit);
if(row>0 && processAudit.getProcessLeaderId()!=null&& !processAudit.getProcessLeaderId().equals(oldProcess.getProcessLeaderId())){
- planPersonService.checkPersonUnique(new AssPlanPerson().setPersonId(processAudit.getProcessLeaderId()).setProjectId(oldProcess.getProjectId()));
+ // planPersonService.checkPersonUnique(new AssPlanPerson().setPersonId(processAudit.getProcessLeaderId()).setProjectId(oldProcess.getProjectId()));
//todo 删除旧的项目成员
- planPersonService.deletePlanPersonByPersonId(oldProcess.getProcessLeaderId());
+ planPersonService.deletePlanPersonByPersonId(oldProcess.getProcessLeaderId(),processAudit.getProjectId(),PlayRoleEnum.PROCESS_LEADER.getCode());
//todo 新增新的项目成员
planPersonService.addPlanPerson(new AssPlanPerson().setPersonId(processAudit.getProcessLeaderId())
.setPlayRole(PlayRoleEnum.PROCESS_LEADER.getCode())
@@ -89,7 +89,7 @@
public AssProcessAudit getProcessAuditByProjectId(Long projectId) {
projectService.checkUserAllowed(projectId);
AssProcessAudit processAudit= baseMapper.getProcessAuditByProjectId(projectId);
- processAudit.setAccessoryFiles(accessoryFileService.getAccessoryFileByProjectId(projectId, AccessoryFileTypeEnum.PROCESS_ATTACHMENT.getCode()));
+ processAudit.setAccessoryFiles(accessoryFileService.getAccessoryFileByProjectId(projectId, null,AccessoryFileTypeEnum.PROCESS_ATTACHMENT.getCode()));
return processAudit;
}
--
Gitblit v1.9.2