From 5d2cfd4562f74496a5263db3451c1e78ff53aead Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期四, 27 三月 2025 08:44:16 +0800
Subject: [PATCH] 单据增加查询返回字段
---
assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssWorkNotificationServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssWorkNotificationServiceImpl.java b/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssWorkNotificationServiceImpl.java
index 13d47b4..a3ba2d6 100644
--- a/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssWorkNotificationServiceImpl.java
+++ b/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssWorkNotificationServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.assess.common.exception.ApiException;
+import com.gkhy.assess.system.domain.AssProject;
import com.gkhy.assess.system.domain.AssWorkNotification;
import com.gkhy.assess.system.enums.AccessoryFileTypeEnum;
import com.gkhy.assess.system.enums.ReportProgressEnum;
@@ -34,10 +35,17 @@
Long projectId=workNotification.getProjectId();
projectService.checkUserAllowed(projectId);
checkWorkNotificationCount(projectId);
- Integer fileCount=accessoryFileService.getAccessoryFileCountByProjectId(projectId,null, AccessoryFileTypeEnum.EMPLOYMENT_NOTICE.getCode());
- if(fileCount==0){
- throw new ApiException("未上传从业告知书");
+ AssProject projectById = projectService.getProjectById(projectId);
+ if (projectById==null){
+ throw new ApiException("项目不存在");
}
+ if(projectById.getEstimateType() != 33){
+ Integer fileCount=accessoryFileService.getAccessoryFileCountByProjectId(projectId,null, AccessoryFileTypeEnum.EMPLOYMENT_NOTICE.getCode());
+ if(fileCount==0){
+ throw new ApiException("未上传从业告知书");
+ }
+ }
+
//校验项目状态
projectService.checkReportProgress(projectId, ReportProgressEnum.ESTIMATE_PLAN);
workNotification.setCreateBy(ShiroUtils.getSysUser().getUsername());
--
Gitblit v1.9.2