songqq/contract-manager
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

feat: 添加VendorGroupRequireFileTypeVo及相关服务功能

Browse Source 
refactor: 重构多个服务类和方法，优化代码结构
fix: 修复PermissionVo中code字段更名为key的问题
docs: 更新create_vo.md文档，添加新创建的VO记录
perf: 优化WebSocketClientService中的session关闭逻辑
style: 清理无用导入和注释，统一代码格式
This commit is contained in:
宋其青
2025-09-21 23:08:34 +08:00
parent 039d753bab
commit 35b33d401b
94 changed files with 1260 additions and 810 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/src/main/java/com/ecep/contract/task/ContractVerifyComm.java
View File

@@ -444,9 +444,9 @@ public class ContractVerifyComm {
boolean loseFile = false;
ContractFileService fileService = getContractFileService();
List<ContractFileVo> files = fileService.findAllByContract(contract);
List<VendorGroupRequireFileType> list = getVendorGroupRequireFileTypeService().findByGroupId(group.getId());
List<VendorGroupRequireFileTypeVo> list = getVendorGroupRequireFileTypeService().findByGroupId(group.getId());
if (list != null && !list.isEmpty()) {
for (VendorGroupRequireFileType item : list) {
for (VendorGroupRequireFileTypeVo item : list) {
ContractFileType fileType = item.getFileType();
if (fileType == null) {
continue;
@@ -469,17 +469,18 @@ public class ContractVerifyComm {
holder.debug("指定供应商, 跳过供应商比价");
} else {
boolean requireQuotation = group.isRequireQuotationSheetForBid();
List<ContractBidVendor> bidVendors = getContractBidVendorService().findByContract(contract);
List<ContractBidVendorVo> bidVendors = getContractBidVendorService().findByContract(contract);
if (bidVendors == null || bidVendors.isEmpty()) {
holder.error("未上报供应商比价");
} else {
for (ContractBidVendor bidVendor : bidVendors) {
ContractFileVo contractFile = fileService.findById(bidVendor.getQuotationSheet().getId());
for (ContractBidVendorVo bidVendor : bidVendors) {
ContractFileVo contractFile = fileService.findById(bidVendor.getQuotationSheetFileId());
if (contractFile == null) {
if (requireQuotation && bidVendor.getCompany().getId().equals(contract.getCompanyId())) {
if (requireQuotation && bidVendor.getCompanyId().equals(contract.getCompanyId())) {
holder.debug("供应商类型启用了允许选中供应商不必须要有报价表");
} else {
holder.error("供应商比价：" + bidVendor.getCompany().getName() + " 未上传/关联报价表");
CompanyVo company = getCompanyService().findById(bidVendor.getCompanyId());
holder.error("供应商比价：" + company.getName() + " 未上传/关联报价表");
loseFile = true;
}
} else {