diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/constant/DictionaryConstant.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/constant/DictionaryConstant.java index 306da2b76..b57113705 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/constant/DictionaryConstant.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/constant/DictionaryConstant.java @@ -1,8 +1,24 @@ package com.zhgd.xmgl.modules.basicdata.constant; public interface DictionaryConstant { + /** + * 项目施工阶段 + */ String PROJECT_CONSTRUCTION_STAGE = "project_construction_stage"; + /** + * AI分析硬件设备报警记录类型 + */ String AI_ANALYSE_HARD_WARE_ALARM_RECORD_TYPE = "ai_analyse_hard_ware_alarm_record_type"; + /** + * 隧道定位各项目的标签消失时间配置 + */ String LOCATION_DATA_PROJECT_SN_DISAPPEAR_TIME = "location_data_project_sn_disappear_time"; + /** + * 项目的结构类型 + */ String PROJECT_STRUCTURE_TYPE = "project_structure_type"; + /** + * 合作单位的资质文件的资质类型 + */ + String ENTERPRISE_QUALIFICATION_QUALIFICATION_TYPE = "enterprise_qualification_qualification_type"; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java index 31b1879a1..a10d3ef94 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java @@ -48,9 +48,7 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -173,7 +171,14 @@ public class XzSupplierQualificationApplyServiceImpl extends ServiceImpl qualificationRecords = dto.getQualificationRecords(); List enterpriseSupplierInfos = dto.getEnterpriseSupplierInfos(); - List supplierApprovalList = baseMapper.getSupplierApprovalList(apply.getProjectSn(), supplierRecord.getSocialCode()); + String projectSn = apply.getProjectSn(); + List mustHave = Arrays.asList(1, 2, 3); + Set set = qualificationRecords.stream().filter(x -> mustHave.contains(x.getQualificationType())).map(XzSupplierQualificationRecord::getQualificationType).collect(Collectors.toSet()); + int i = 3; + if (CollUtil.isEmpty(qualificationRecords) || set.size() < i) { + throw new OpenAlertException("资质文件的资质类型的(安全协议、劳务分包合同、施工合同必须都要上传"); + } + List supplierApprovalList = baseMapper.getSupplierApprovalList(projectSn, supplierRecord.getSocialCode()); long c1 = supplierApprovalList.stream().filter(apply1 -> Objects.equals(apply1.getApplyStatus(), 1)).count(); if (c1 > 0) { throw new OpenAlertException("该承包商(信用代码:" + supplierRecord.getSocialCode() + ")待审核中"); @@ -186,18 +191,16 @@ public class XzSupplierQualificationApplyServiceImpl extends ServiceImpl systemUserList = systemUserService.getProjectChildernSystemUserList(new MapBuilder().put("projectSn", apply.getProjectSn()).put("isSafetyAndMonitoringRoleName", 1).put(Cts.IGNORE_DATA_SCOPE, Cts.IGNORE_DATA_SCOPE).build()); + List systemUserList = systemUserService.getProjectChildernSystemUserList(new MapBuilder().put("projectSn", projectSn).put("isSafetyAndMonitoringRoleName", 1).put(Cts.IGNORE_DATA_SCOPE, Cts.IGNORE_DATA_SCOPE).build()); if (CollUtil.isNotEmpty(systemUserList)) { noticeService.addUsersNotice(systemUserList.stream().map(SystemUser::getUserId).collect(Collectors.toList()), title, msg, "1"); }