From 9c3306eea3a2dcbefa27762285962b2b1185be2f Mon Sep 17 00:00:00 2001 From: songqq Date: Tue, 23 Sep 2025 23:37:04 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E7=AE=A1=E7=90=86=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=8F=8A=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增供应商名录管理功能，包括合格供应商名录、供应商文件、供应商关联实体等模块。主要变更包括： 1. 添加COMPANY_VENDOR_ENTITY表的CREATOR_ID、MODIFIER_ID和MODIFY_DATE字段 2. 实现供应商同步任务类(VendorClassSyncTask等) 3. 新增供应商相关VO类(VendorApprovedVo、VendorFileVo等) 4. 添加供应商相关Repository接口(VendorRepository、VendorFileRepository等) 5. 实现供应商相关服务类(VendorApprovedService、VendorFileService等) 6. 添加供应商管理界面控制器及皮肤类 7. 新增供应商文件类型枚举和本地化配置 --- .../{ => cloud/rk}/CloudRkManagerSkin.java | 0 .../rk}/CloudRkManagerWindowController.java | 0 .../{ => cloud/tyc}/CloudTycManagerSkin.java | 0 .../tyc}/CloudTycManagerWindowController.java | 0 .../u8}/YongYouU8ConfigWindowController.java | 0 .../{ => cloud/u8}/YongYouU8ManagerSkin.java | 0 .../u8}/YongYouU8ManagerWindowController.java | 0 .../bank_account}/BankAccountBaseTabSkin.java | 0 .../BankAccountWindowController.java | 0 .../old_name}/CompanyOldNameTabSkinBase.java | 0 .../old_name}/CompanyOldNameTabSkinFile.java | 0 .../CompanyOldNameWindowController.java | 0 ...bSkin.java => AbstVendorTableTabSkin.java} | 14 ++-- ...anagerSkin.java => VendorManagerSkin.java} | 10 +-- ...ava => VendorManagerWindowController.java} | 18 ++--- ...abSkinBase.java => VendorTabSkinBase.java} | 13 ++-- ...inEntity.java => VendorTabSkinEntity.java} | 12 +-- ...oller.java => VendorWindowController.java} | 12 +-- ...ava => VendorApprovedListManagerSkin.java} | 12 +-- ...rApprovedListManagerWindowController.java} | 10 +-- ...ava => VendorApprovedListTabSkinBase.java} | 4 +- ...va => VendorApprovedListTabSkinFiles.java} | 22 +++--- ... => VendorApprovedListTabSkinVendors.java} | 38 ++++----- ...> VendorApprovedListVendorExportTask.java} | 78 +++++++++---------- ...> VendorApprovedListVendorImportTask.java} | 78 +++++++++---------- ...> VendorApprovedListWindowController.java} | 16 ++-- .../{ => bid}/VendorBidWindowController.java | 0 .../order}/PurchaseOrderWindowController.java | 0 .../PurchaseBillVoucherWindowController.java | 0 ...verter.java => VendorStringConverter.java} | 8 +- ...ce.java => VendorApprovedFileService.java} | 10 +-- ...ce.java => VendorApprovedItemService.java} | 12 +-- ...ervice.java => VendorApprovedService.java} | 11 ++- ...yService.java => VendorEntityService.java} | 15 ++-- ...ileService.java => VendorFileService.java} | 20 ++--- ...yVendorService.java => VendorService.java} | 18 ++--- .../ContractGroupSyncTask.java | 0 .../ContractKindSyncTask.java | 0 .../ContractSyncAllTask.java | 0 .../ContractTypeSyncTask.java | 0 .../CustomerClassSyncTask.java | 0 .../VendorClassSyncTask.java | 0 .../{controller => util}/ComboBoxUtils.java | 0 ...rApprovedList.java => VendorApproved.java} | 4 +- ...rovedFile.java => VendorApprovedFile.java} | 2 +- ...rovedItem.java => VendorApprovedItem.java} | 2 +- ...anyVendorEntity.java => VendorEntity.java} | 0 ...CompanyVendorFile.java => VendorFile.java} | 0 ...dFileVo.java => VendorApprovedFileVo.java} | 0 ...dItemVo.java => VendorApprovedItemVo.java} | 0 ...rovedListVo.java => VendorApprovedVo.java} | 0 ...endorEntityVo.java => VendorEntityVo.java} | 0 ...anyVendorFileVo.java => VendorFileVo.java} | 0 .../{CompanyVendorVo.java => VendorVo.java} | 0 .../model => docs/db}/CompanyVendor.sql | 0 .../CompanyVendorApprovedFileRepository.java | 16 ---- .../CompanyVendorApprovedItemRepository.java | 25 ------ .../VendorApprovedFileRepository.java | 16 ++++ .../VendorApprovedItemRepository.java | 25 ++++++ ...ory.java => VendorApprovedRepository.java} | 4 +- ...itory.java => VendorEntityRepository.java} | 8 +- ...ository.java => VendorFileRepository.java} | 10 +-- ...rRepository.java => VendorRepository.java} | 0 ...ce.java => VendorApprovedFileService.java} | 20 ++--- ...ce.java => VendorApprovedItemService.java} | 24 +++--- ...ervice.java => VendorApprovedService.java} | 44 +++++------ ...yService.java => VendorEntityService.java} | 28 +++---- ...ileService.java => VendorFileService.java} | 40 +++++----- ...yVendorService.java => VendorService.java} | 16 ++-- 69 files changed, 349 insertions(+), 366 deletions(-) rename client/src/main/java/com/ecep/contract/controller/{ => cloud/rk}/CloudRkManagerSkin.java (100%) rename client/src/main/java/com/ecep/contract/controller/{ => cloud/rk}/CloudRkManagerWindowController.java (100%) rename client/src/main/java/com/ecep/contract/controller/{ => cloud/tyc}/CloudTycManagerSkin.java (100%) rename client/src/main/java/com/ecep/contract/controller/{ => cloud/tyc}/CloudTycManagerWindowController.java (100%) rename client/src/main/java/com/ecep/contract/controller/{ => cloud/u8}/YongYouU8ConfigWindowController.java (100%) rename client/src/main/java/com/ecep/contract/controller/{ => cloud/u8}/YongYouU8ManagerSkin.java (100%) rename client/src/main/java/com/ecep/contract/controller/{ => cloud/u8}/YongYouU8ManagerWindowController.java (100%) rename client/src/main/java/com/ecep/contract/controller/{bank/account => company/bank_account}/BankAccountBaseTabSkin.java (100%) rename client/src/main/java/com/ecep/contract/controller/{bank/account => company/bank_account}/BankAccountWindowController.java (100%) rename client/src/main/java/com/ecep/contract/controller/{company_old_name => company/old_name}/CompanyOldNameTabSkinBase.java (100%) rename client/src/main/java/com/ecep/contract/controller/{company_old_name => company/old_name}/CompanyOldNameTabSkinFile.java (100%) rename client/src/main/java/com/ecep/contract/controller/{company_old_name => company/old_name}/CompanyOldNameWindowController.java (100%) rename client/src/main/java/com/ecep/contract/controller/vendor/{AbstCompanyVendorTableTabSkin.java => AbstVendorTableTabSkin.java} (72%) rename client/src/main/java/com/ecep/contract/controller/vendor/{CompanyVendorManagerSkin.java => VendorManagerSkin.java} (89%) rename client/src/main/java/com/ecep/contract/controller/vendor/{CompanyVendorManagerWindowController.java => VendorManagerWindowController.java} (86%) rename client/src/main/java/com/ecep/contract/controller/vendor/{CompanyVendorTabSkinBase.java => VendorTabSkinBase.java} (92%) rename client/src/main/java/com/ecep/contract/controller/vendor/{CompanyVendorTabSkinEntity.java => VendorTabSkinEntity.java} (90%) rename client/src/main/java/com/ecep/contract/controller/vendor/{CompanyVendorWindowController.java => VendorWindowController.java} (91%) rename client/src/main/java/com/ecep/contract/controller/vendor/approved_list/{CompanyVendorApprovedListManagerSkin.java => VendorApprovedListManagerSkin.java} (75%) rename client/src/main/java/com/ecep/contract/controller/vendor/approved_list/{CompanyVendorApprovedListManagerWindowController.java => VendorApprovedListManagerWindowController.java} (80%) rename client/src/main/java/com/ecep/contract/controller/vendor/approved_list/{CompanyVendorApprovedListTabSkinBase.java => VendorApprovedListTabSkinBase.java} (91%) rename client/src/main/java/com/ecep/contract/controller/vendor/approved_list/{CompanyVendorApprovedListTabSkinFiles.java => VendorApprovedListTabSkinFiles.java} (83%) rename client/src/main/java/com/ecep/contract/controller/vendor/approved_list/{CompanyVendorApprovedListTabSkinVendors.java => VendorApprovedListTabSkinVendors.java} (88%) rename client/src/main/java/com/ecep/contract/controller/vendor/approved_list/{CompanyVendorApprovedListVendorExportTask.java => VendorApprovedListVendorExportTask.java} (90%) rename client/src/main/java/com/ecep/contract/controller/vendor/approved_list/{CompanyVendorApprovedListVendorImportTask.java => VendorApprovedListVendorImportTask.java} (88%) rename client/src/main/java/com/ecep/contract/controller/vendor/approved_list/{CompanyVendorApprovedListWindowController.java => VendorApprovedListWindowController.java} (87%) rename client/src/main/java/com/ecep/contract/controller/vendor/{ => bid}/VendorBidWindowController.java (100%) rename client/src/main/java/com/ecep/contract/controller/vendor/{ => purchase/order}/PurchaseOrderWindowController.java (100%) rename client/src/main/java/com/ecep/contract/controller/vendor/{ => purchase/purchase_bill}/PurchaseBillVoucherWindowController.java (100%) rename client/src/main/java/com/ecep/contract/converter/{CompanyVendorStringConverter.java => VendorStringConverter.java} (77%) rename client/src/main/java/com/ecep/contract/service/{CompanyVendorApprovedFileService.java => VendorApprovedFileService.java} (56%) rename client/src/main/java/com/ecep/contract/service/{CompanyVendorApprovedItemService.java => VendorApprovedItemService.java} (57%) rename client/src/main/java/com/ecep/contract/service/{CompanyVendorApprovedListService.java => VendorApprovedService.java} (60%) rename client/src/main/java/com/ecep/contract/service/{CompanyVendorEntityService.java => VendorEntityService.java} (70%) rename client/src/main/java/com/ecep/contract/service/{CompanyVendorFileService.java => VendorFileService.java} (74%) rename client/src/main/java/com/ecep/contract/service/{CompanyVendorService.java => VendorService.java} (88%) rename client/src/main/java/com/ecep/contract/{controller => task}/ContractGroupSyncTask.java (100%) rename client/src/main/java/com/ecep/contract/{controller => task}/ContractKindSyncTask.java (100%) rename client/src/main/java/com/ecep/contract/{controller => task}/ContractSyncAllTask.java (100%) rename client/src/main/java/com/ecep/contract/{controller => task}/ContractTypeSyncTask.java (100%) rename client/src/main/java/com/ecep/contract/{controller => task}/CustomerClassSyncTask.java (100%) rename client/src/main/java/com/ecep/contract/{controller => task}/VendorClassSyncTask.java (100%) rename client/src/main/java/com/ecep/contract/{controller => util}/ComboBoxUtils.java (100%) rename common/src/main/java/com/ecep/contract/model/{CompanyVendorApprovedList.java => VendorApproved.java} (91%) rename common/src/main/java/com/ecep/contract/model/{CompanyVendorApprovedFile.java => VendorApprovedFile.java} (98%) rename common/src/main/java/com/ecep/contract/model/{CompanyVendorApprovedItem.java => VendorApprovedItem.java} (98%) rename common/src/main/java/com/ecep/contract/model/{CompanyVendorEntity.java => VendorEntity.java} (100%) rename common/src/main/java/com/ecep/contract/model/{CompanyVendorFile.java => VendorFile.java} (100%) rename common/src/main/java/com/ecep/contract/vo/{CompanyVendorApprovedFileVo.java => VendorApprovedFileVo.java} (100%) rename common/src/main/java/com/ecep/contract/vo/{CompanyVendorApprovedItemVo.java => VendorApprovedItemVo.java} (100%) rename common/src/main/java/com/ecep/contract/vo/{CompanyVendorApprovedListVo.java => VendorApprovedVo.java} (100%) rename common/src/main/java/com/ecep/contract/vo/{CompanyVendorEntityVo.java => VendorEntityVo.java} (100%) rename common/src/main/java/com/ecep/contract/vo/{CompanyVendorFileVo.java => VendorFileVo.java} (100%) rename common/src/main/java/com/ecep/contract/vo/{CompanyVendorVo.java => VendorVo.java} (100%) rename {server/src/main/java/com/ecep/contract/ds/vendor/model => docs/db}/CompanyVendor.sql (100%) delete mode 100644 server/src/main/java/com/ecep/contract/ds/vendor/repository/CompanyVendorApprovedFileRepository.java delete mode 100644 server/src/main/java/com/ecep/contract/ds/vendor/repository/CompanyVendorApprovedItemRepository.java create mode 100644 server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorApprovedFileRepository.java create mode 100644 server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorApprovedItemRepository.java rename server/src/main/java/com/ecep/contract/ds/vendor/repository/{CompanyVendorApprovedListRepository.java => VendorApprovedRepository.java} (67%) rename server/src/main/java/com/ecep/contract/ds/vendor/repository/{CompanyVendorEntityRepository.java => VendorEntityRepository.java} (60%) rename server/src/main/java/com/ecep/contract/ds/vendor/repository/{CompanyVendorFileRepository.java => VendorFileRepository.java} (52%) rename server/src/main/java/com/ecep/contract/ds/vendor/repository/{CompanyVendorRepository.java => VendorRepository.java} (100%) rename server/src/main/java/com/ecep/contract/ds/vendor/service/{CompanyVendorApprovedFileService.java => VendorApprovedFileService.java} (77%) rename server/src/main/java/com/ecep/contract/ds/vendor/service/{CompanyVendorApprovedItemService.java => VendorApprovedItemService.java} (75%) rename server/src/main/java/com/ecep/contract/ds/vendor/service/{CompanyVendorApprovedListService.java => VendorApprovedService.java} (76%) rename server/src/main/java/com/ecep/contract/ds/vendor/service/{CompanyVendorEntityService.java => VendorEntityService.java} (75%) rename server/src/main/java/com/ecep/contract/ds/vendor/service/{CompanyVendorFileService.java => VendorFileService.java} (83%) rename server/src/main/java/com/ecep/contract/ds/vendor/service/{CompanyVendorService.java => VendorService.java} (96%) diff --git a/client/src/main/java/com/ecep/contract/controller/CloudRkManagerSkin.java b/client/src/main/java/com/ecep/contract/controller/cloud/rk/CloudRkManagerSkin.java similarity index 100% rename from client/src/main/java/com/ecep/contract/controller/CloudRkManagerSkin.java rename to client/src/main/java/com/ecep/contract/controller/cloud/rk/CloudRkManagerSkin.java diff --git a/client/src/main/java/com/ecep/contract/controller/CloudRkManagerWindowController.java b/client/src/main/java/com/ecep/contract/controller/cloud/rk/CloudRkManagerWindowController.java similarity index 100% rename from client/src/main/java/com/ecep/contract/controller/CloudRkManagerWindowController.java rename to client/src/main/java/com/ecep/contract/controller/cloud/rk/CloudRkManagerWindowController.java diff --git a/client/src/main/java/com/ecep/contract/controller/CloudTycManagerSkin.java b/client/src/main/java/com/ecep/contract/controller/cloud/tyc/CloudTycManagerSkin.java similarity index 100% rename from client/src/main/java/com/ecep/contract/controller/CloudTycManagerSkin.java rename to client/src/main/java/com/ecep/contract/controller/cloud/tyc/CloudTycManagerSkin.java diff --git a/client/src/main/java/com/ecep/contract/controller/CloudTycManagerWindowController.java b/client/src/main/java/com/ecep/contract/controller/cloud/tyc/CloudTycManagerWindowController.java similarity index 100% rename from client/src/main/java/com/ecep/contract/controller/CloudTycManagerWindowController.java rename to client/src/main/java/com/ecep/contract/controller/cloud/tyc/CloudTycManagerWindowController.java diff --git a/client/src/main/java/com/ecep/contract/controller/YongYouU8ConfigWindowController.java b/client/src/main/java/com/ecep/contract/controller/cloud/u8/YongYouU8ConfigWindowController.java similarity index 100% rename from client/src/main/java/com/ecep/contract/controller/YongYouU8ConfigWindowController.java rename to client/src/main/java/com/ecep/contract/controller/cloud/u8/YongYouU8ConfigWindowController.java diff --git a/client/src/main/java/com/ecep/contract/controller/YongYouU8ManagerSkin.java b/client/src/main/java/com/ecep/contract/controller/cloud/u8/YongYouU8ManagerSkin.java similarity index 100% rename from client/src/main/java/com/ecep/contract/controller/YongYouU8ManagerSkin.java rename to client/src/main/java/com/ecep/contract/controller/cloud/u8/YongYouU8ManagerSkin.java diff --git a/client/src/main/java/com/ecep/contract/controller/YongYouU8ManagerWindowController.java b/client/src/main/java/com/ecep/contract/controller/cloud/u8/YongYouU8ManagerWindowController.java similarity index 100% rename from client/src/main/java/com/ecep/contract/controller/YongYouU8ManagerWindowController.java rename to client/src/main/java/com/ecep/contract/controller/cloud/u8/YongYouU8ManagerWindowController.java diff --git a/client/src/main/java/com/ecep/contract/controller/bank/account/BankAccountBaseTabSkin.java b/client/src/main/java/com/ecep/contract/controller/company/bank_account/BankAccountBaseTabSkin.java similarity index 100% rename from client/src/main/java/com/ecep/contract/controller/bank/account/BankAccountBaseTabSkin.java rename to client/src/main/java/com/ecep/contract/controller/company/bank_account/BankAccountBaseTabSkin.java diff --git a/client/src/main/java/com/ecep/contract/controller/bank/account/BankAccountWindowController.java b/client/src/main/java/com/ecep/contract/controller/company/bank_account/BankAccountWindowController.java similarity index 100% rename from client/src/main/java/com/ecep/contract/controller/bank/account/BankAccountWindowController.java rename to client/src/main/java/com/ecep/contract/controller/company/bank_account/BankAccountWindowController.java diff --git a/client/src/main/java/com/ecep/contract/controller/company_old_name/CompanyOldNameTabSkinBase.java b/client/src/main/java/com/ecep/contract/controller/company/old_name/CompanyOldNameTabSkinBase.java similarity index 100% rename from client/src/main/java/com/ecep/contract/controller/company_old_name/CompanyOldNameTabSkinBase.java rename to client/src/main/java/com/ecep/contract/controller/company/old_name/CompanyOldNameTabSkinBase.java diff --git a/client/src/main/java/com/ecep/contract/controller/company_old_name/CompanyOldNameTabSkinFile.java b/client/src/main/java/com/ecep/contract/controller/company/old_name/CompanyOldNameTabSkinFile.java similarity index 100% rename from client/src/main/java/com/ecep/contract/controller/company_old_name/CompanyOldNameTabSkinFile.java rename to client/src/main/java/com/ecep/contract/controller/company/old_name/CompanyOldNameTabSkinFile.java diff --git a/client/src/main/java/com/ecep/contract/controller/company_old_name/CompanyOldNameWindowController.java b/client/src/main/java/com/ecep/contract/controller/company/old_name/CompanyOldNameWindowController.java similarity index 100% rename from client/src/main/java/com/ecep/contract/controller/company_old_name/CompanyOldNameWindowController.java rename to client/src/main/java/com/ecep/contract/controller/company/old_name/CompanyOldNameWindowController.java diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/AbstCompanyVendorTableTabSkin.java b/client/src/main/java/com/ecep/contract/controller/vendor/AbstVendorTableTabSkin.java similarity index 72% rename from client/src/main/java/com/ecep/contract/controller/vendor/AbstCompanyVendorTableTabSkin.java rename to client/src/main/java/com/ecep/contract/controller/vendor/AbstVendorTableTabSkin.java index a040a60..c54a8dc 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/AbstCompanyVendorTableTabSkin.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/AbstVendorTableTabSkin.java @@ -1,19 +1,17 @@ package com.ecep.contract.controller.vendor; -import java.util.Map; - import com.ecep.contract.controller.tab.TabSkin; import com.ecep.contract.controller.table.AbstEntityTableTabSkin; import com.ecep.contract.model.IdentityEntity; import com.ecep.contract.service.CompanyService; -import com.ecep.contract.service.CompanyVendorService; +import com.ecep.contract.service.VendorService; import com.ecep.contract.util.ParamUtils; import com.ecep.contract.vm.CompanyVendorViewModel; import com.ecep.contract.vm.IdentityViewModel; -import com.ecep.contract.vo.CompanyVendorVo; +import com.ecep.contract.vo.VendorVo; public abstract class AbstCompanyVendorTableTabSkin> - extends AbstEntityTableTabSkin + extends AbstEntityTableTabSkin implements TabSkin { public AbstCompanyVendorTableTabSkin(CompanyVendorWindowController controller) { super(controller); @@ -23,12 +21,12 @@ public abstract class AbstCompanyVendorTableTabSkin { + AbstEntityManagerSkin { @Setter private CompanyService companyService; - public CompanyVendorManagerSkin(CompanyVendorManagerWindowController controller) { + public CompanyVendorManagerSkin(VendorManagerWindowController controller) { super(controller); } @@ -33,7 +33,7 @@ public class CompanyVendorManagerSkin return companyService; } - public CompanyVendorService getCompanyVendorService() { + public VendorService getCompanyVendorService() { return controller.getViewModelService(); } diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/CompanyVendorManagerWindowController.java b/client/src/main/java/com/ecep/contract/controller/vendor/VendorManagerWindowController.java similarity index 86% rename from client/src/main/java/com/ecep/contract/controller/vendor/CompanyVendorManagerWindowController.java rename to client/src/main/java/com/ecep/contract/controller/vendor/VendorManagerWindowController.java index de54092..9704636 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/CompanyVendorManagerWindowController.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/VendorManagerWindowController.java @@ -3,6 +3,7 @@ package com.ecep.contract.controller.vendor; import java.time.LocalDate; import java.util.concurrent.CompletableFuture; +import com.ecep.contract.service.VendorService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Scope; @@ -17,12 +18,11 @@ import com.ecep.contract.controller.AbstManagerWindowController; import com.ecep.contract.controller.vendor.approved_list.CompanyVendorApprovedListManagerWindowController; import com.ecep.contract.controller.vendor.group.VendorGroupManagerWindowController; import com.ecep.contract.service.CompanyService; -import com.ecep.contract.service.CompanyVendorService; import com.ecep.contract.task.VendorVerifyAllTasker; import com.ecep.contract.util.FxmlPath; import com.ecep.contract.util.UITools; import com.ecep.contract.vm.CompanyVendorViewModel; -import com.ecep.contract.vo.CompanyVendorVo; +import com.ecep.contract.vo.VendorVo; import com.ecep.contract.vo.VendorTypeLocalVo; import javafx.event.ActionEvent; @@ -35,7 +35,7 @@ import javafx.stage.Stage; @Component @FxmlPath("/ui/company/vendor/vendor_manager.fxml") public class CompanyVendorManagerWindowController - extends AbstManagerWindowController { + extends AbstManagerWindowController { // columns public TableColumn idColumn; @@ -53,7 +53,7 @@ public class CompanyVendorManagerWindowController @Autowired private CompanyService companyService; @Autowired - private CompanyVendorService companyVendorService; + private VendorService vendorService; @Override public void show(Stage stage) { @@ -62,8 +62,8 @@ public class CompanyVendorManagerWindowController } @Override - public CompanyVendorService getViewModelService() { - return companyVendorService; + public VendorService getViewModelService() { + return vendorService; } public void onFileReBuildingAction(ActionEvent event) { @@ -75,11 +75,11 @@ public class CompanyVendorManagerWindowController }; while (true) { - Page page = companyVendorService.findAll(null, pageRequest); - for (CompanyVendorVo companyVendor : page) { + Page page = vendorService.findAll(null, pageRequest); + for (VendorVo companyVendor : page) { MessageHolder sub = messageHolder .sub(page.getNumber() + "/" + page.getTotalPages() + " #" + companyVendor.getId() + ">"); - companyVendorService.reBuildingFiles(companyVendor, sub); + vendorService.reBuildingFiles(companyVendor, sub); } if (!page.hasNext()) { break; diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/CompanyVendorTabSkinBase.java b/client/src/main/java/com/ecep/contract/controller/vendor/VendorTabSkinBase.java similarity index 92% rename from client/src/main/java/com/ecep/contract/controller/vendor/CompanyVendorTabSkinBase.java rename to client/src/main/java/com/ecep/contract/controller/vendor/VendorTabSkinBase.java index 68f7a89..78a599a 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/CompanyVendorTabSkinBase.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/VendorTabSkinBase.java @@ -1,7 +1,6 @@ package com.ecep.contract.controller.vendor; import java.time.format.DateTimeFormatter; -import java.util.List; import com.ecep.contract.MyDateTimeUtils; import com.ecep.contract.SpringApp; @@ -9,18 +8,16 @@ import com.ecep.contract.VendorType; import com.ecep.contract.controller.ComboBoxUtils; import com.ecep.contract.controller.company.CompanyWindowController; import com.ecep.contract.controller.tab.AbstEntityBasedTabSkin; -import com.ecep.contract.model.VendorTypeLocal; import com.ecep.contract.service.CompanyContactService; -import com.ecep.contract.service.CompanyVendorService; +import com.ecep.contract.service.VendorService; import com.ecep.contract.service.VendorCatalogService; import com.ecep.contract.service.VendorTypeService; import com.ecep.contract.util.UITools; import com.ecep.contract.vm.CompanyVendorViewModel; import com.ecep.contract.vm.CompanyViewModel; -import com.ecep.contract.vo.CompanyVendorVo; +import com.ecep.contract.vo.VendorVo; import com.ecep.contract.vo.CompanyVo; -import javafx.beans.property.SimpleObjectProperty; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.event.ActionEvent; @@ -30,7 +27,7 @@ import javafx.util.converter.LocalDateStringConverter; import javafx.util.converter.LocalDateTimeStringConverter; public class CompanyVendorTabSkinBase - extends AbstEntityBasedTabSkin { + extends AbstEntityBasedTabSkin { public CompanyVendorTabSkinBase(CompanyVendorWindowController controller) { super(controller); } @@ -101,7 +98,7 @@ public class CompanyVendorTabSkinBase } public void onCreatePathAction(ActionEvent event) { - CompanyVendorVo companyVendor = getEntity(); + VendorVo companyVendor = getEntity(); if (getCompanyVendorService().makePathAbsent(companyVendor)) { save(companyVendor); } else { @@ -117,7 +114,7 @@ public class CompanyVendorTabSkinBase setStatus("未实现"); } - public CompanyVendorService getCompanyVendorService() { + public VendorService getCompanyVendorService() { return controller.getViewModelService(); } } diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/CompanyVendorTabSkinEntity.java b/client/src/main/java/com/ecep/contract/controller/vendor/VendorTabSkinEntity.java similarity index 90% rename from client/src/main/java/com/ecep/contract/controller/vendor/CompanyVendorTabSkinEntity.java rename to client/src/main/java/com/ecep/contract/controller/vendor/VendorTabSkinEntity.java index 72abe24..bc7ab68 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/CompanyVendorTabSkinEntity.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/VendorTabSkinEntity.java @@ -5,11 +5,11 @@ import java.time.LocalDate; import com.ecep.contract.controller.tab.TabSkin; import com.ecep.contract.controller.table.cell.EmployeeTableCell; import com.ecep.contract.controller.table.cell.VendorCatalogTableCell; -import com.ecep.contract.service.CompanyVendorEntityService; +import com.ecep.contract.service.VendorEntityService; import com.ecep.contract.service.VendorCatalogService; import com.ecep.contract.util.FxmlPath; import com.ecep.contract.vm.CompanyVendorEntityViewModel; -import com.ecep.contract.vo.CompanyVendorEntityVo; +import com.ecep.contract.vo.VendorEntityVo; import javafx.scene.control.MenuItem; import javafx.scene.control.Tab; @@ -17,7 +17,7 @@ import javafx.scene.control.TableColumn; @FxmlPath("/ui/company/vendor/vendor-tab-entity.fxml") public class CompanyVendorTabSkinEntity - extends AbstCompanyVendorTableTabSkin + extends AbstCompanyVendorTableTabSkin implements TabSkin { // 关联项 tab @@ -39,12 +39,12 @@ public class CompanyVendorTabSkinEntity super(controller); } - CompanyVendorEntityService getVendorEntityService() { - return getCachedBean(CompanyVendorEntityService.class); + VendorEntityService getVendorEntityService() { + return getCachedBean(VendorEntityService.class); } @Override - protected CompanyVendorEntityService getViewModelService() { + protected VendorEntityService getViewModelService() { return getVendorEntityService(); } diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/CompanyVendorWindowController.java b/client/src/main/java/com/ecep/contract/controller/vendor/VendorWindowController.java similarity index 91% rename from client/src/main/java/com/ecep/contract/controller/vendor/CompanyVendorWindowController.java rename to client/src/main/java/com/ecep/contract/controller/vendor/VendorWindowController.java index 915e7f8..f2e12d5 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/CompanyVendorWindowController.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/VendorWindowController.java @@ -14,7 +14,7 @@ import org.springframework.util.StringUtils; import com.ecep.contract.DesktopUtils; import com.ecep.contract.controller.AbstEntityController; import com.ecep.contract.service.CompanyService; -import com.ecep.contract.service.CompanyVendorService; +import com.ecep.contract.service.VendorService; import com.ecep.contract.util.FxmlPath; import com.ecep.contract.vm.CompanyVendorViewModel; @@ -31,20 +31,20 @@ import javafx.scene.control.TextField; import javafx.scene.layout.BorderPane; import javafx.stage.Window; import javafx.stage.WindowEvent; -import com.ecep.contract.vo.CompanyVendorVo; +import com.ecep.contract.vo.VendorVo; import com.ecep.contract.vo.CompanyVo; @Lazy @Scope("prototype") @Component @FxmlPath("/ui/company/vendor/vendor.fxml") -public class CompanyVendorWindowController extends AbstEntityController { +public class CompanyVendorWindowController extends AbstEntityController { private static final Logger logger = LoggerFactory.getLogger(CompanyVendorWindowController.class); /** * 显示界面 */ - public static void show(CompanyVendorVo companyVendor, Window window) { + public static void show(VendorVo companyVendor, Window window) { show(CompanyVendorWindowController.class, CompanyVendorViewModel.from(companyVendor), window); } @@ -91,8 +91,8 @@ public class CompanyVendorWindowController extends AbstEntityController { + extends AbstEntityManagerSkin { @Setter - private CompanyVendorApprovedListService service; + private VendorApprovedService service; public CompanyVendorApprovedListManagerSkin(CompanyVendorApprovedListManagerWindowController controller) { super(controller); } - public CompanyVendorApprovedListService getService() { + public VendorApprovedService getService() { return service; } @@ -40,7 +40,7 @@ public class CompanyVendorApprovedListManagerSkin @Override protected void onTableCreateNewAction(ActionEvent event) { - CompanyVendorApprovedListVo list = new CompanyVendorApprovedListVo(); + VendorApprovedVo list = new VendorApprovedVo(); CompanyVendorApprovedListViewModel viewModel = CompanyVendorApprovedListViewModel.from(list); dataSet.add(viewModel); diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/CompanyVendorApprovedListManagerWindowController.java b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListManagerWindowController.java similarity index 80% rename from client/src/main/java/com/ecep/contract/controller/vendor/approved_list/CompanyVendorApprovedListManagerWindowController.java rename to client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListManagerWindowController.java index 4bc0876..d8b550e 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/CompanyVendorApprovedListManagerWindowController.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListManagerWindowController.java @@ -8,9 +8,9 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import com.ecep.contract.controller.AbstManagerWindowController; -import com.ecep.contract.service.CompanyVendorApprovedListService; +import com.ecep.contract.service.VendorApprovedService; import com.ecep.contract.util.FxmlPath; -import com.ecep.contract.vo.CompanyVendorApprovedListVo; +import com.ecep.contract.vo.VendorApprovedVo; import com.ecep.contract.vm.CompanyVendorApprovedListViewModel; import javafx.event.ActionEvent; @@ -25,7 +25,7 @@ import javafx.stage.WindowEvent; @Component @FxmlPath("/ui/company/vendor/vendor_approved_list_manager.fxml") public class CompanyVendorApprovedListManagerWindowController - extends AbstManagerWindowController { + extends AbstManagerWindowController { public TableColumn idColumn; public TableColumn titleColumn; @@ -33,7 +33,7 @@ public class CompanyVendorApprovedListManagerWindowController public TableColumn descriptionColumn; @Autowired - private CompanyVendorApprovedListService service; + private VendorApprovedService service; @Override protected CompanyVendorApprovedListManagerSkin createDefaultSkin() { @@ -49,7 +49,7 @@ public class CompanyVendorApprovedListManagerWindowController } @Override - public CompanyVendorApprovedListService getViewModelService() { + public VendorApprovedService getViewModelService() { return service; } diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/CompanyVendorApprovedListTabSkinBase.java b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinBase.java similarity index 91% rename from client/src/main/java/com/ecep/contract/controller/vendor/approved_list/CompanyVendorApprovedListTabSkinBase.java rename to client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinBase.java index a444e33..7e369ef 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/CompanyVendorApprovedListTabSkinBase.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinBase.java @@ -4,7 +4,7 @@ import java.time.format.DateTimeFormatter; import com.ecep.contract.controller.tab.AbstEntityBasedTabSkin; import com.ecep.contract.controller.tab.TabSkin; -import com.ecep.contract.vo.CompanyVendorApprovedListVo; +import com.ecep.contract.vo.VendorApprovedVo; import com.ecep.contract.vm.CompanyVendorApprovedListViewModel; import javafx.scene.control.Tab; @@ -12,7 +12,7 @@ import javafx.util.converter.LocalDateStringConverter; public class CompanyVendorApprovedListTabSkinBase extends - AbstEntityBasedTabSkin + AbstEntityBasedTabSkin implements TabSkin { public CompanyVendorApprovedListTabSkinBase(CompanyVendorApprovedListWindowController controller) { super(controller); diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/CompanyVendorApprovedListTabSkinFiles.java b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinFiles.java similarity index 83% rename from client/src/main/java/com/ecep/contract/controller/vendor/approved_list/CompanyVendorApprovedListTabSkinFiles.java rename to client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinFiles.java index dedc50d..a8d4bbc 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/CompanyVendorApprovedListTabSkinFiles.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinFiles.java @@ -2,7 +2,6 @@ package com.ecep.contract.controller.vendor.approved_list; import java.io.File; import java.time.LocalDate; -import java.util.Map; import java.util.concurrent.CompletableFuture; import org.springframework.util.StringUtils; @@ -10,13 +9,12 @@ import org.springframework.util.StringUtils; import com.ecep.contract.DesktopUtils; import com.ecep.contract.controller.tab.TabSkin; import com.ecep.contract.controller.table.AbstEntityTableTabSkin; -import com.ecep.contract.model.CompanyVendorApprovedFile; -import com.ecep.contract.service.CompanyVendorApprovedFileService; +import com.ecep.contract.service.VendorApprovedFileService; import com.ecep.contract.util.FxmlPath; import com.ecep.contract.util.ParamUtils; import com.ecep.contract.util.ParamUtils.Builder; -import com.ecep.contract.vo.CompanyVendorApprovedFileVo; -import com.ecep.contract.vo.CompanyVendorApprovedListVo; +import com.ecep.contract.vo.VendorApprovedFileVo; +import com.ecep.contract.vo.VendorApprovedVo; import com.ecep.contract.vm.CompanyVendorApprovedFileViewModel; import com.ecep.contract.vm.CompanyVendorApprovedListViewModel; @@ -28,10 +26,10 @@ import javafx.scene.control.TableColumn; @FxmlPath("/ui/company/vendor/vendor_approved_list-tab-file.fxml") public class CompanyVendorApprovedListTabSkinFiles extends - AbstEntityTableTabSkin + AbstEntityTableTabSkin implements TabSkin { - private CompanyVendorApprovedFileService fileService; + private VendorApprovedFileService fileService; public TableColumn fileTable_idColumn; public TableColumn fileTable_filePathColumn; @@ -42,20 +40,20 @@ public class CompanyVendorApprovedListTabSkinFiles super(controller); } - CompanyVendorApprovedFileService getFileService() { + VendorApprovedFileService getFileService() { if (fileService == null) { - fileService = getBean(CompanyVendorApprovedFileService.class); + fileService = getBean(VendorApprovedFileService.class); } return fileService; } @Override - protected CompanyVendorApprovedFileService getViewModelService() { + protected VendorApprovedFileService getViewModelService() { return getFileService(); } @Override - public Builder getSpecification(CompanyVendorApprovedListVo parent) { + public Builder getSpecification(VendorApprovedVo parent) { return ParamUtils.builder().equals("list", parent.getId()); } @@ -77,7 +75,7 @@ public class CompanyVendorApprovedListTabSkinFiles public void onFileReBuildingAction(ActionEvent event) { CompletableFuture.runAsync(() -> { int id = viewModel.getId().get(); - CompanyVendorApprovedListVo list = new CompanyVendorApprovedListVo(); + VendorApprovedVo list = new VendorApprovedVo(); viewModel.copyTo(list); try { // 在实际应用中，这里需要调整为通过service调用处理VO对象 diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/CompanyVendorApprovedListTabSkinVendors.java b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinVendors.java similarity index 88% rename from client/src/main/java/com/ecep/contract/controller/vendor/approved_list/CompanyVendorApprovedListTabSkinVendors.java rename to client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinVendors.java index 66628dc..8594d20 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/CompanyVendorApprovedListTabSkinVendors.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinVendors.java @@ -38,12 +38,12 @@ import lombok.Setter; @FxmlPath("/ui/company/vendor/vendor_approved_list-tab-vendor.fxml") public class CompanyVendorApprovedListTabSkinVendors extends - AbstEntityTableTabSkin + AbstEntityTableTabSkin implements TabSkin { @Setter - private CompanyVendorApprovedItemService itemService; + private VendorApprovedItemService itemService; private CompanyService companyService; - private CompanyVendorService companyVendorService; + private VendorService vendorService; private CompanyOldNameService companyOldNameService; public ComboBox typeSelector; @@ -78,26 +78,26 @@ public class CompanyVendorApprovedListTabSkinVendors return companyOldNameService; } - public CompanyVendorService getCompanyVendorService() { - if (companyVendorService == null) { - companyVendorService = getBean(CompanyVendorService.class); + public VendorService getVendorService() { + if (vendorService == null) { + vendorService = getBean(VendorService.class); } - return companyVendorService; + return vendorService; } public SysConfService getConfService() { return controller.getConfService(); } - CompanyVendorApprovedItemService getItemService() { + VendorApprovedItemService getItemService() { if (itemService == null) { - itemService = getBean(CompanyVendorApprovedItemService.class); + itemService = getBean(VendorApprovedItemService.class); } return itemService; } @Override - protected CompanyVendorApprovedItemService getViewModelService() { + protected VendorApprovedItemService getViewModelService() { return getItemService(); } @@ -112,7 +112,7 @@ public class CompanyVendorApprovedListTabSkinVendors } @Override - public ParamUtils.Builder getSpecification(CompanyVendorApprovedListVo parent) { + public ParamUtils.Builder getSpecification(VendorApprovedVo parent) { Builder params = getSpecification(); params.equals("list", parent.getId()); return params; @@ -131,7 +131,7 @@ public class CompanyVendorApprovedListTabSkinVendors idColumn.setCellValueFactory(param -> param.getValue().getId()); // 厂商, vendor vendorColumn.setCellValueFactory(param -> param.getValue().getVendor()); - vendorColumn.setCellFactory(CompanyVendorTableCell.forTableColumn(getCompanyVendorService())); + vendorColumn.setCellFactory(CompanyVendorTableCell.forTableColumn(getVendorService())); // 类型, type typeColumn.setCellValueFactory(param -> param.getValue().getType()); typeColumn.setCellFactory(VendorTypeTableCell.forTableColumn(getCachedBean(VendorTypeService.class))); @@ -187,10 +187,10 @@ public class CompanyVendorApprovedListTabSkinVendors selectedItem.getType().set(value.getType()); int id = selectedItem.getId().get(); - CompanyVendorApprovedItemService itemService = getItemService(); - CompanyVendorApprovedItemVo item = itemService.findById(id); + VendorApprovedItemService itemService = getItemService(); + VendorApprovedItemVo item = itemService.findById(id); if (selectedItem.copyTo(item)) { - CompanyVendorApprovedItemVo saved = itemService.save(item); + VendorApprovedItemVo saved = itemService.save(item); selectedItem.update(saved); } } @@ -202,7 +202,7 @@ public class CompanyVendorApprovedListTabSkinVendors } public void onVendorTableImportAction(ActionEvent event) { - CompanyVendorApprovedListVo approvedList = getParent(); + VendorApprovedVo approvedList = getParent(); CompanyVendorApprovedListVendorImportTask task = new CompanyVendorApprovedListVendorImportTask(approvedList); task.setLogUnqualifiedVendor(logUnqualifiedVendorChecker.isSelected()); @@ -220,7 +220,7 @@ public class CompanyVendorApprovedListTabSkinVendors } public void onVendorTableUpdateAction(ActionEvent event) { - CompanyVendorService vendorService = getCompanyVendorService(); + VendorService vendorService = getVendorService(); CompanyService companyService = getCompanyService(); CompanyOldNameService companyOldNameService = getCompanyOldNameService(); @@ -231,7 +231,7 @@ public class CompanyVendorApprovedListTabSkinVendors CompanyVendorApprovedItemViewModel first = list.removeFirst(); Integer vendorId = first.getVendor().get(); ; - CompanyVendorVo companyVendor = vendorService.findById(vendorId); + VendorVo companyVendor = vendorService.findById(vendorId); CompanyVo company = companyService.findById(companyVendor.getCompanyId()); CompanyOldNameVo oldName = companyOldNameService.findMatchByDate(company, viewModel.getPublishDate().get()); @@ -243,7 +243,7 @@ public class CompanyVendorApprovedListTabSkinVendors public void onVendorTableShowVendorAction(ActionEvent event) { CompanyVendorApprovedItemViewModel selectedItem = getTableView().getSelectionModel().getSelectedItem(); - CompanyVendorVo companyVendor = getCompanyVendorService().findById(selectedItem.getVendor().get()); + VendorVo companyVendor = getVendorService().findById(selectedItem.getVendor().get()); CompanyVendorWindowController.show(companyVendor, null); } diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/CompanyVendorApprovedListVendorExportTask.java b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListVendorExportTask.java similarity index 90% rename from client/src/main/java/com/ecep/contract/controller/vendor/approved_list/CompanyVendorApprovedListVendorExportTask.java rename to client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListVendorExportTask.java index 803b0ad..18d12a3 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/CompanyVendorApprovedListVendorExportTask.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListVendorExportTask.java @@ -19,6 +19,7 @@ import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; +import com.ecep.contract.service.*; import org.apache.poi.ss.usermodel.BorderStyle; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellStyle; @@ -41,21 +42,16 @@ import org.springframework.util.StringUtils; import com.ecep.contract.MessageHolder; import com.ecep.contract.MyDateTimeUtils; import com.ecep.contract.VendorType; -import com.ecep.contract.service.CompanyContactService; -import com.ecep.contract.service.CompanyVendorApprovedFileService; -import com.ecep.contract.service.CompanyVendorApprovedItemService; -import com.ecep.contract.service.CompanyVendorApprovedListService; -import com.ecep.contract.service.CompanyVendorService; -import com.ecep.contract.service.ContractService; +import com.ecep.contract.service.VendorService; import com.ecep.contract.task.Tasker; import com.ecep.contract.util.ExcelUtils; import com.ecep.contract.util.ParamUtils; import com.ecep.contract.util.ProxyUtils; import com.ecep.contract.vo.CompanyContactVo; -import com.ecep.contract.vo.CompanyVendorApprovedFileVo; -import com.ecep.contract.vo.CompanyVendorApprovedItemVo; -import com.ecep.contract.vo.CompanyVendorApprovedListVo; -import com.ecep.contract.vo.CompanyVendorVo; +import com.ecep.contract.vo.VendorApprovedFileVo; +import com.ecep.contract.vo.VendorApprovedItemVo; +import com.ecep.contract.vo.VendorApprovedVo; +import com.ecep.contract.vo.VendorVo; import com.ecep.contract.vo.CompanyVo; import com.ecep.contract.vo.ContractVo; @@ -69,34 +65,34 @@ public class CompanyVendorApprovedListVendorExportTask extends Tasker { public static final String STR_CHANGE_VENDOR_TYPE_SHEET = "变更供应商类型"; @Setter - private CompanyVendorApprovedListVo approvedList; + private VendorApprovedVo approvedList; - private CompanyVendorApprovedListService service; - private CompanyVendorApprovedFileService fileService; - private CompanyVendorApprovedItemService itemService; + private VendorApprovedService service; + private VendorApprovedFileService fileService; + private VendorApprovedItemService itemService; private ContractService contractService; - private CompanyVendorService companyVendorService; + private VendorService vendorService; private CompanyContactService companyContactService; private static final String FILE_NAME = "供方名录-%s.xlsx"; - private CompanyVendorApprovedListService getService() { + private VendorApprovedService getService() { if (service == null) { - service = getBean(CompanyVendorApprovedListService.class); + service = getBean(VendorApprovedService.class); } return service; } - private CompanyVendorApprovedFileService getFileService() { + private VendorApprovedFileService getFileService() { if (fileService == null) { - fileService = getBean(CompanyVendorApprovedFileService.class); + fileService = getBean(VendorApprovedFileService.class); } return fileService; } - private CompanyVendorApprovedItemService getItemService() { + private VendorApprovedItemService getItemService() { if (itemService == null) { - itemService = getBean(CompanyVendorApprovedItemService.class); + itemService = getBean(VendorApprovedItemService.class); } return itemService; } @@ -115,15 +111,15 @@ public class CompanyVendorApprovedListVendorExportTask extends Tasker { return companyContactService; } - private CompanyVendorService getCompanyVendorService() { - if (companyVendorService == null) { - companyVendorService = getBean(CompanyVendorService.class); + private VendorService getVendorService() { + if (vendorService == null) { + vendorService = getBean(VendorService.class); } - return companyVendorService; + return vendorService; } private File getVendorApprovedListTemplate() { - return getCompanyVendorService().getVendorApprovedListTemplate(); + return getVendorService().getVendorApprovedListTemplate(); } @Override @@ -192,10 +188,10 @@ public class CompanyVendorApprovedListVendorExportTask extends Tasker { } } - CompanyVendorApprovedFileVo approvedFile = getFileService() + VendorApprovedFileVo approvedFile = getFileService() .findByName(approvedList, destFile.getName()); if (approvedFile == null) { - approvedFile = new CompanyVendorApprovedFileVo(); + approvedFile = new VendorApprovedFileVo(); } approvedFile.setListId(approvedList.getId()); approvedFile.setFileName(destFile.getName()); @@ -341,7 +337,7 @@ public class CompanyVendorApprovedListVendorExportTask extends Tasker { private void updateTypicallySheet(Workbook wb, Sheet sheet, MessageHolder holder) { updateTitle("更新一般供方 Sheet"); - List items = getItemService() + List items = getItemService() .findAll(ParamUtils.builder().equals("type", VendorType.TYPICALLY) .equals("list", approvedList.getId()).build(), Pageable.unpaged(Sort.by("vendor"))) .getContent(); @@ -356,13 +352,13 @@ public class CompanyVendorApprovedListVendorExportTask extends Tasker { borderStyle.setBorderLeft(BorderStyle.THIN); // 左边框 borderStyle.setBorderRight(BorderStyle.THIN); // 右边框 - List meetQualified = new ArrayList<>(); + List meetQualified = new ArrayList<>(); for (int i = 0; i < items.size(); i++) { - CompanyVendorApprovedItemVo item = items.get(i); + VendorApprovedItemVo item = items.get(i); updateProgress(i, items.size()); - CompanyVendorVo vendor = getCompanyVendorService().findById(item.getVendorId()); + VendorVo vendor = getVendorService().findById(item.getVendorId()); CompanyVo company = getCompanyService().findById(vendor.getCompanyId()); setCellValue(sheet, "A" + (prefixRow + i), "" + vendor.getId()).setCellStyle(borderStyle); @@ -420,14 +416,14 @@ public class CompanyVendorApprovedListVendorExportTask extends Tasker { changeSheet.setColumnWidth(6, 13 * 256); holder.debug("创建 " + STR_CHANGE_VENDOR_TYPE_SHEET + " Sheet"); - for (CompanyVendorApprovedItemVo item : meetQualified) { + for (VendorApprovedItemVo item : meetQualified) { outputMeetQualified(changeSheet, item, holder); } } } - private void outputMeetQualified(Sheet sheet, CompanyVendorApprovedItemVo item, MessageHolder holder) { - CompanyVendorVo vendor = getCompanyVendorService().findById(item.getVendorId()); + private void outputMeetQualified(Sheet sheet, VendorApprovedItemVo item, MessageHolder holder) { + VendorVo vendor = getVendorService().findById(item.getVendorId()); CompanyVo company = getCompanyService().findById(vendor.getCompanyId()); String vendorName = item.getVendorName(); if (!StringUtils.hasText(vendorName)) { @@ -438,8 +434,8 @@ public class CompanyVendorApprovedListVendorExportTask extends Tasker { holder.info("详情输出到 " + sheet.getSheetName() + " Sheet 中，请查看"); } - private void outputMeetQualified(Sheet sheet, CompanyVendorVo vendor, String vendorName, - CompanyVendorApprovedItemVo item) { + private void outputMeetQualified(Sheet sheet, VendorVo vendor, String vendorName, + VendorApprovedItemVo item) { AtomicInteger row = meetRow; setCellValue(sheet, row.get(), 1, "供方：" + vendorName).setCellStyle(venodrNameCellStyle); sheet.getRow(row.get()).setHeight((short) (30 * 20)); @@ -512,7 +508,7 @@ public class CompanyVendorApprovedListVendorExportTask extends Tasker { private void updateQualifiedSheet(Sheet sheet, MessageHolder holder) { updateTitle("更新合格供方 Sheet"); - List items = getItemService().findAll( + List items = getItemService().findAll( ParamUtils.builder().equals("type", VendorType.QUALIFIED).equals("list", approvedList.getId()).build(), Pageable.unpaged(Sort.by("vendor.name"))).getContent(); holder.debug("载入合共供方：" + items.size() + " 条"); @@ -583,10 +579,10 @@ public class CompanyVendorApprovedListVendorExportTask extends Tasker { } for (int i = 0; i < items.size(); i++) { - CompanyVendorApprovedItemVo item = items.get(i); + VendorApprovedItemVo item = items.get(i); updateProgress(i, items.size()); - CompanyVendorVo vendor = getCompanyVendorService().findById(item.getVendorId()); + VendorVo vendor = getVendorService().findById(item.getVendorId()); CompanyVo company = getCompanyService().findById(vendor.getCompanyId()); setCellValue(sheet, "A" + (prefixRow), "" + vendor.getId()).setCellStyle(beginCellStyles[0]); @@ -641,7 +637,7 @@ public class CompanyVendorApprovedListVendorExportTask extends Tasker { } - private void save(CompanyVendorApprovedFileVo approvedFile) { + private void save(VendorApprovedFileVo approvedFile) { getFileService().save(approvedFile); } } diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/CompanyVendorApprovedListVendorImportTask.java b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListVendorImportTask.java similarity index 88% rename from client/src/main/java/com/ecep/contract/controller/vendor/approved_list/CompanyVendorApprovedListVendorImportTask.java rename to client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListVendorImportTask.java index c8c6188..81f46c2 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/CompanyVendorApprovedListVendorImportTask.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListVendorImportTask.java @@ -10,6 +10,7 @@ import java.util.function.Consumer; import java.util.stream.Collectors; import java.util.stream.Stream; +import com.ecep.contract.service.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.domain.Page; @@ -20,19 +21,14 @@ import com.ecep.contract.MessageHolder; import com.ecep.contract.VendorFileType; import com.ecep.contract.VendorType; import com.ecep.contract.model.Vendor; -import com.ecep.contract.service.CompanyOldNameService; -import com.ecep.contract.service.CompanyVendorApprovedItemService; -import com.ecep.contract.service.CompanyVendorApprovedListService; -import com.ecep.contract.service.CompanyVendorFileService; -import com.ecep.contract.service.CompanyVendorService; -import com.ecep.contract.service.ContractService; +import com.ecep.contract.service.VendorService; import com.ecep.contract.task.Tasker; import com.ecep.contract.util.ParamUtils; import com.ecep.contract.vo.CompanyOldNameVo; -import com.ecep.contract.vo.CompanyVendorApprovedItemVo; -import com.ecep.contract.vo.CompanyVendorApprovedListVo; -import com.ecep.contract.vo.CompanyVendorFileVo; -import com.ecep.contract.vo.CompanyVendorVo; +import com.ecep.contract.vo.VendorApprovedItemVo; +import com.ecep.contract.vo.VendorApprovedVo; +import com.ecep.contract.vo.VendorFileVo; +import com.ecep.contract.vo.VendorVo; import com.ecep.contract.vo.CompanyVo; import com.ecep.contract.vo.ContractVo; @@ -48,33 +44,33 @@ public class CompanyVendorApprovedListVendorImportTask extends Tasker { public static final String STR_MEET_TYPICALLY = "符合一般供方标准"; public static final String STR_MEET_UNQUALIFIED = "符合不合格供方标准"; - private final CompanyVendorApprovedListVo approvedList; + private final VendorApprovedVo approvedList; - private CompanyVendorApprovedListService service; - private CompanyVendorApprovedItemService itemService; - private CompanyVendorFileService companyVendorFileService; + private VendorApprovedService service; + private VendorApprovedItemService itemService; + private VendorFileService vendorFileService; private CompanyOldNameService companyOldNameService; private ContractService contractService; private final AtomicInteger counter = new AtomicInteger(0); - public CompanyVendorApprovedListVendorImportTask(CompanyVendorApprovedListVo approvedList) { + public CompanyVendorApprovedListVendorImportTask(VendorApprovedVo approvedList) { this.approvedList = approvedList; updateTitle("供方名录-供方导入"); } - private CompanyVendorApprovedItemService getItemService() { + private VendorApprovedItemService getItemService() { if (itemService == null) { - itemService = getBean(CompanyVendorApprovedItemService.class); + itemService = getBean(VendorApprovedItemService.class); } return itemService; } - private CompanyVendorFileService getCompanyVendorFileService() { - if (companyVendorFileService == null) { - companyVendorFileService = getBean(CompanyVendorFileService.class); + private VendorFileService getVendorFileService() { + if (vendorFileService == null) { + vendorFileService = getBean(VendorFileService.class); } - return companyVendorFileService; + return vendorFileService; } private CompanyOldNameService getCompanyOldNameService() { @@ -99,16 +95,16 @@ public class CompanyVendorApprovedListVendorImportTask extends Tasker { return null; } - service = getBean(CompanyVendorApprovedListService.class); - CompanyVendorService vendorService = getBean(CompanyVendorService.class); - Page page = vendorService.findAll( + service = getBean(VendorApprovedService.class); + VendorService vendorService = getBean(VendorService.class); + Page page = vendorService.findAll( ParamUtils.builder() .isNotNull("created") .lessThan("developDate", endDate) .build(), Pageable.unpaged()); holder.debug("读取到" + page.getTotalElements()); - try (Stream stream = page.stream()) { + try (Stream stream = page.stream()) { stream.forEach(v -> { if (isCancelled()) { holder.debug("Cancelled"); @@ -137,7 +133,7 @@ public class CompanyVendorApprovedListVendorImportTask extends Tasker { @Setter private boolean logTypicallyVendorNoThreeYearContract = true; - private void sync(CompanyVendorVo vendor, MessageHolder holder) { + private void sync(VendorVo vendor, MessageHolder holder) { // 明确 company 实例 CompanyVo company = initializedVendorCompany(vendor); if (company == null) { @@ -162,10 +158,10 @@ public class CompanyVendorApprovedListVendorImportTask extends Tasker { } // 确认供方是否在供方名录中,可能有多个，所以返回 list，默认取第一个 - List items = getItemService().findAllByListAndVendor(approvedList, vendor); + List items = getItemService().findAllByListAndVendor(approvedList, vendor); if (items == null || items.isEmpty()) { // 供方不在供方名录中时，新建一个 - CompanyVendorApprovedItemVo item = new CompanyVendorApprovedItemVo(); + VendorApprovedItemVo item = new VendorApprovedItemVo(); item.setListId(approvedList.getId()); item.setVendorId(vendor.getId()); @@ -260,7 +256,7 @@ public class CompanyVendorApprovedListVendorImportTask extends Tasker { } if (items.size() == 1) { - CompanyVendorApprovedItemVo first = items.getFirst(); + VendorApprovedItemVo first = items.getFirst(); if (!StringUtils.hasText(first.getVendorName())) { updateVendorNameWithOldName(vendor, first); } @@ -269,13 +265,13 @@ public class CompanyVendorApprovedListVendorImportTask extends Tasker { } for (int i = 1; i < items.size(); i++) { - CompanyVendorApprovedItemVo item = items.get(i); + VendorApprovedItemVo item = items.get(i); getItemService().delete(item); subHolder.debug("删除重复的供方名录项：#" + item.getId()); } } - private void updateVendorNameWithOldName(CompanyVendorVo vendor, CompanyVendorApprovedItemVo item) { + private void updateVendorNameWithOldName(VendorVo vendor, VendorApprovedItemVo item) { CompanyVo company = initializedVendorCompany(vendor); if (company == null) { return; @@ -294,10 +290,10 @@ public class CompanyVendorApprovedListVendorImportTask extends Tasker { private boolean logUnqualifiedVendorRemove = true; private void updateItem( - CompanyVendorVo vendor, CompanyVendorApprovedItemVo item, MessageHolder holder) { + VendorVo vendor, VendorApprovedItemVo item, MessageHolder holder) { VendorType t1 = item.getType(); VendorType vendorType = vendor.getType(); - CompanyVendorApprovedItemService itemService = getItemService(); + VendorApprovedItemService itemService = getItemService(); if (t1 != vendorType) { holder.warn("注意分类不一致, " + t1 + ", " + vendorType + "."); } @@ -415,13 +411,13 @@ public class CompanyVendorApprovedListVendorImportTask extends Tasker { * @see #findAllEvaluationFormFiles(Vendor, LocalDate) */ private boolean checkAsQualifiedVendorByEvaluationFormFiles( - CompanyVendorVo vendor, CompanyVendorApprovedItemVo item, MessageHolder holder) { - List files = findAllEvaluationFormFiles(vendor, approvedList.getPublishDate()); + VendorVo vendor, VendorApprovedItemVo item, MessageHolder holder) { + List files = findAllEvaluationFormFiles(vendor, approvedList.getPublishDate()); if (files.isEmpty()) { return false; } - CompanyVendorFileVo first = files.getFirst(); + VendorFileVo first = files.getFirst(); item.setType(VendorType.TYPICALLY); File file = new File(first.getFilePath()); holder.info("供方是不合格供方, 但在发布期一年内有有效评价表 " + file.getName() + ", 调整为一般供应商"); @@ -485,7 +481,7 @@ public class CompanyVendorApprovedListVendorImportTask extends Tasker { } private boolean checkAsTypicallyVendorByContracts( - CompanyVendorVo vendor, CompanyVendorApprovedItemVo item, Consumer consumer) { + VendorVo vendor, VendorApprovedItemVo item, Consumer consumer) { // 查看供方的合同，看近3年期间是否有合同 List contracts = findAllVendorContracts(vendor, approvedList.getPublishDate()); if (contracts.isEmpty()) { @@ -539,7 +535,7 @@ public class CompanyVendorApprovedListVendorImportTask extends Tasker { * @param date 日期 * @return 3年内的合同列表 */ - private List findAllVendorContracts(CompanyVendorVo vendor, LocalDate date) { + private List findAllVendorContracts(VendorVo vendor, LocalDate date) { ContractService contractService = getContractService(); int beginYear = date.getYear() - (vendorContractMinusYear - 1); @@ -548,7 +544,7 @@ public class CompanyVendorApprovedListVendorImportTask extends Tasker { return contractService.findAllByCompanyVendor(vendor, miniDate, date); } - private CompanyVo initializedVendorCompany(CompanyVendorVo vendor) { + private CompanyVo initializedVendorCompany(VendorVo vendor) { CompanyVo company = getCompanyService().findById(vendor.getCompanyId()); return company; } @@ -563,8 +559,8 @@ public class CompanyVendorApprovedListVendorImportTask extends Tasker { * @param publishDate * @return */ - private List findAllEvaluationFormFiles(CompanyVendorVo vendor, LocalDate publishDate) { - CompanyVendorFileService fileService = getCompanyVendorFileService(); + private List findAllEvaluationFormFiles(VendorVo vendor, LocalDate publishDate) { + VendorFileService fileService = getVendorFileService(); LocalDate miniDate = publishDate.minusYears(vendorFileMinusYear); return fileService.findAll(ParamUtils.builder() .equals("vendor", vendor.getId()) diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/CompanyVendorApprovedListWindowController.java b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListWindowController.java similarity index 87% rename from client/src/main/java/com/ecep/contract/controller/vendor/approved_list/CompanyVendorApprovedListWindowController.java rename to client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListWindowController.java index 11b901c..f5b2114 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/CompanyVendorApprovedListWindowController.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListWindowController.java @@ -12,11 +12,11 @@ import org.springframework.util.StringUtils; import com.ecep.contract.DesktopUtils; import com.ecep.contract.controller.AbstEntityController; -import com.ecep.contract.service.CompanyVendorApprovedListService; +import com.ecep.contract.service.VendorApprovedService; import com.ecep.contract.util.FxmlPath; import com.ecep.contract.util.UITools; import com.ecep.contract.vm.CompanyVendorApprovedListViewModel; -import com.ecep.contract.vo.CompanyVendorApprovedListVo; +import com.ecep.contract.vo.VendorApprovedVo; import javafx.event.ActionEvent; import javafx.scene.control.Button; @@ -35,16 +35,16 @@ import javafx.stage.WindowEvent; @Component @FxmlPath("/ui/company/vendor/vendor_approved_list.fxml") public class CompanyVendorApprovedListWindowController - extends AbstEntityController { + extends AbstEntityController { private static final Logger logger = LoggerFactory.getLogger(CompanyVendorApprovedListWindowController.class); - public static void show(CompanyVendorApprovedListVo list, Window window) { + public static void show(VendorApprovedVo list, Window window) { CompanyVendorApprovedListViewModel model = CompanyVendorApprovedListViewModel.from(list); show(CompanyVendorApprovedListWindowController.class, model, window); } @Autowired - private CompanyVendorApprovedListService service; + private VendorApprovedService service; public BorderPane root; public TabPane tabPane; @@ -79,7 +79,7 @@ public class CompanyVendorApprovedListWindowController } @Override - public CompanyVendorApprovedListService getViewModelService() { + public VendorApprovedService getViewModelService() { return service; } @@ -105,10 +105,10 @@ public class CompanyVendorApprovedListWindowController public void onApprovedListCreatePathAction(ActionEvent event) { int id = viewModel.getId().get(); - CompanyVendorApprovedListVo list = service.findById(id); + VendorApprovedVo list = service.findById(id); if (service.makePathAbsent(list)) { - CompanyVendorApprovedListVo saved = service.save(list); + VendorApprovedVo saved = service.save(list); viewModel.update(saved); } else { setStatus("目录存在或创建失败"); diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/VendorBidWindowController.java b/client/src/main/java/com/ecep/contract/controller/vendor/bid/VendorBidWindowController.java similarity index 100% rename from client/src/main/java/com/ecep/contract/controller/vendor/VendorBidWindowController.java rename to client/src/main/java/com/ecep/contract/controller/vendor/bid/VendorBidWindowController.java diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/PurchaseOrderWindowController.java b/client/src/main/java/com/ecep/contract/controller/vendor/purchase/order/PurchaseOrderWindowController.java similarity index 100% rename from client/src/main/java/com/ecep/contract/controller/vendor/PurchaseOrderWindowController.java rename to client/src/main/java/com/ecep/contract/controller/vendor/purchase/order/PurchaseOrderWindowController.java diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/PurchaseBillVoucherWindowController.java b/client/src/main/java/com/ecep/contract/controller/vendor/purchase/purchase_bill/PurchaseBillVoucherWindowController.java similarity index 100% rename from client/src/main/java/com/ecep/contract/controller/vendor/PurchaseBillVoucherWindowController.java rename to client/src/main/java/com/ecep/contract/controller/vendor/purchase/purchase_bill/PurchaseBillVoucherWindowController.java diff --git a/client/src/main/java/com/ecep/contract/converter/CompanyVendorStringConverter.java b/client/src/main/java/com/ecep/contract/converter/VendorStringConverter.java similarity index 77% rename from client/src/main/java/com/ecep/contract/converter/CompanyVendorStringConverter.java rename to client/src/main/java/com/ecep/contract/converter/VendorStringConverter.java index bef26f2..736ca52 100644 --- a/client/src/main/java/com/ecep/contract/converter/CompanyVendorStringConverter.java +++ b/client/src/main/java/com/ecep/contract/converter/VendorStringConverter.java @@ -4,17 +4,17 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; -import com.ecep.contract.service.CompanyVendorService; -import com.ecep.contract.vo.CompanyVendorVo; +import com.ecep.contract.service.VendorService; +import com.ecep.contract.vo.VendorVo; import jakarta.annotation.PostConstruct; @Lazy @Component -public class CompanyVendorStringConverter extends EntityStringConverter { +public class CompanyVendorStringConverter extends EntityStringConverter { @Lazy @Autowired - private CompanyVendorService service; + private VendorService service; public CompanyVendorStringConverter() { diff --git a/client/src/main/java/com/ecep/contract/service/CompanyVendorApprovedFileService.java b/client/src/main/java/com/ecep/contract/service/VendorApprovedFileService.java similarity index 56% rename from client/src/main/java/com/ecep/contract/service/CompanyVendorApprovedFileService.java rename to client/src/main/java/com/ecep/contract/service/VendorApprovedFileService.java index 61dd7e9..a1f2528 100644 --- a/client/src/main/java/com/ecep/contract/service/CompanyVendorApprovedFileService.java +++ b/client/src/main/java/com/ecep/contract/service/VendorApprovedFileService.java @@ -4,19 +4,19 @@ import org.springframework.stereotype.Service; import com.ecep.contract.MessageHolder; import com.ecep.contract.vm.CompanyVendorApprovedFileViewModel; -import com.ecep.contract.vo.CompanyVendorApprovedFileVo; -import com.ecep.contract.vo.CompanyVendorApprovedListVo; +import com.ecep.contract.vo.VendorApprovedFileVo; +import com.ecep.contract.vo.VendorApprovedVo; @Service public class CompanyVendorApprovedFileService - extends QueryService { + extends QueryService { - public CompanyVendorApprovedFileVo findByName(CompanyVendorApprovedListVo approvedList, String name) { + public VendorApprovedFileVo findByName(VendorApprovedVo approvedList, String name) { // TODO Auto-generated method stub throw new UnsupportedOperationException("Unimplemented method 'findByName'"); } - public boolean reBuildingFiles(CompanyVendorApprovedListVo list, MessageHolder holder) { + public boolean reBuildingFiles(VendorApprovedVo list, MessageHolder holder) { // TODO Auto-generated method stub throw new UnsupportedOperationException("Unimplemented method 'reBuildingFiles'"); } diff --git a/client/src/main/java/com/ecep/contract/service/CompanyVendorApprovedItemService.java b/client/src/main/java/com/ecep/contract/service/VendorApprovedItemService.java similarity index 57% rename from client/src/main/java/com/ecep/contract/service/CompanyVendorApprovedItemService.java rename to client/src/main/java/com/ecep/contract/service/VendorApprovedItemService.java index efa80c5..3381cb8 100644 --- a/client/src/main/java/com/ecep/contract/service/CompanyVendorApprovedItemService.java +++ b/client/src/main/java/com/ecep/contract/service/VendorApprovedItemService.java @@ -7,16 +7,16 @@ import org.springframework.stereotype.Service; import com.ecep.contract.util.ParamUtils; import com.ecep.contract.vm.CompanyVendorApprovedItemViewModel; -import com.ecep.contract.vo.CompanyVendorApprovedItemVo; -import com.ecep.contract.vo.CompanyVendorApprovedListVo; -import com.ecep.contract.vo.CompanyVendorVo; +import com.ecep.contract.vo.VendorApprovedItemVo; +import com.ecep.contract.vo.VendorApprovedVo; +import com.ecep.contract.vo.VendorVo; @Service public class CompanyVendorApprovedItemService - extends QueryService { + extends QueryService { - public List findAllByListAndVendor(CompanyVendorApprovedListVo approvedList, - CompanyVendorVo vendor) { + public List findAllByListAndVendor(VendorApprovedVo approvedList, + VendorVo vendor) { return findAll(ParamUtils.builder() .equals("list", approvedList.getId()) .equals("vendor", vendor.getId()) diff --git a/client/src/main/java/com/ecep/contract/service/CompanyVendorApprovedListService.java b/client/src/main/java/com/ecep/contract/service/VendorApprovedService.java similarity index 60% rename from client/src/main/java/com/ecep/contract/service/CompanyVendorApprovedListService.java rename to client/src/main/java/com/ecep/contract/service/VendorApprovedService.java index 8955a50..1f15965 100644 --- a/client/src/main/java/com/ecep/contract/service/CompanyVendorApprovedListService.java +++ b/client/src/main/java/com/ecep/contract/service/VendorApprovedService.java @@ -3,25 +3,24 @@ package com.ecep.contract.service; import org.springframework.stereotype.Service; import com.ecep.contract.MessageHolder; -import com.ecep.contract.model.CompanyVendorApprovedList; import com.ecep.contract.vm.CompanyVendorApprovedListViewModel; -import com.ecep.contract.vo.CompanyVendorApprovedListVo; +import com.ecep.contract.vo.VendorApprovedVo; @Service public class CompanyVendorApprovedListService - extends QueryService { + extends QueryService { - public boolean makePathAbsent(CompanyVendorApprovedListVo list) { + public boolean makePathAbsent(VendorApprovedVo list) { // TODO Auto-generated method stub throw new UnsupportedOperationException("Unimplemented method 'makePathAbsent'"); } - public boolean reBuildingFiles(CompanyVendorApprovedListVo list, MessageHolder holder) { + public boolean reBuildingFiles(VendorApprovedVo list, MessageHolder holder) { // TODO Auto-generated method stub throw new UnsupportedOperationException("Unimplemented method 'reBuildingFiles'"); } - public boolean existPath(CompanyVendorApprovedListVo entity) { + public boolean existPath(VendorApprovedVo entity) { // TODO Auto-generated method stub throw new UnsupportedOperationException("Unimplemented method 'existPath'"); } diff --git a/client/src/main/java/com/ecep/contract/service/CompanyVendorEntityService.java b/client/src/main/java/com/ecep/contract/service/VendorEntityService.java similarity index 70% rename from client/src/main/java/com/ecep/contract/service/CompanyVendorEntityService.java rename to client/src/main/java/com/ecep/contract/service/VendorEntityService.java index f46e796..dc7622b 100644 --- a/client/src/main/java/com/ecep/contract/service/CompanyVendorEntityService.java +++ b/client/src/main/java/com/ecep/contract/service/VendorEntityService.java @@ -6,18 +6,17 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import com.ecep.contract.util.ParamUtils; -import com.ecep.contract.vo.CompanyVendorEntityVo; -import com.ecep.contract.vo.CompanyVendorVo; +import com.ecep.contract.vo.VendorEntityVo; +import com.ecep.contract.vo.VendorVo; import com.ecep.contract.vm.CompanyVendorEntityViewModel; -import com.ecep.contract.model.CompanyVendorEntity; @Service -public class CompanyVendorEntityService extends QueryService { +public class CompanyVendorEntityService extends QueryService { /** * 根据供应商ID查询关联实体列表 */ - public List findByVendorId(Integer vendorId) { + public List findByVendorId(Integer vendorId) { return findAll(ParamUtils.builder().equals("vendorId", vendorId).build(), Pageable.unpaged()) .getContent(); } @@ -25,15 +24,15 @@ public class CompanyVendorEntityService extends QueryService findByVendor(CompanyVendorVo vendor) { + public List findByVendor(VendorVo vendor) { return findByVendorId(vendor.getId()); } /** * 根据供应商ID创建新的CompanyVendorEntity实例 */ - public CompanyVendorEntityVo newInstanceByVendor(CompanyVendorVo vendor) { - CompanyVendorEntityVo entity = createNewEntity(); + public VendorEntityVo newInstanceByVendor(VendorVo vendor) { + VendorEntityVo entity = createNewEntity(); // 设置供应商ID try { // 通过反射设置vendor属性，因为实体类中可能没有直接的setVendorId方法 diff --git a/client/src/main/java/com/ecep/contract/service/CompanyVendorFileService.java b/client/src/main/java/com/ecep/contract/service/VendorFileService.java similarity index 74% rename from client/src/main/java/com/ecep/contract/service/CompanyVendorFileService.java rename to client/src/main/java/com/ecep/contract/service/VendorFileService.java index 43a49ec..da6348d 100644 --- a/client/src/main/java/com/ecep/contract/service/CompanyVendorFileService.java +++ b/client/src/main/java/com/ecep/contract/service/VendorFileService.java @@ -17,13 +17,13 @@ import com.ecep.contract.model.Vendor; import com.ecep.contract.model.VendorFileTypeLocal; import com.ecep.contract.util.ParamUtils; import com.ecep.contract.vm.CompanyVendorFileViewModel; -import com.ecep.contract.vo.CompanyVendorFileVo; -import com.ecep.contract.vo.CompanyVendorVo; +import com.ecep.contract.vo.VendorFileVo; +import com.ecep.contract.vo.VendorVo; @Service -public class CompanyVendorFileService extends QueryService { +public class CompanyVendorFileService extends QueryService { - public LocalDate getNextSignDate(CompanyVendorVo companyVendor, Consumer state) { + public LocalDate getNextSignDate(VendorVo companyVendor, Consumer state) { // TODO Auto-generated method stub throw new UnsupportedOperationException("Unimplemented method 'getNextSignDate'"); } @@ -37,9 +37,9 @@ public class CompanyVendorFileService extends QueryService files = findAllByVendorAndType(companyVendor, VendorFileType.EvaluationForm); + List files = findAllByVendorAndType(companyVendor, VendorFileType.EvaluationForm); if (files == null || files.isEmpty()) { holder.error("未见供应商评价"); return; @@ -47,15 +47,15 @@ public class CompanyVendorFileService extends QueryService v.getSignDate() != null && v.isValid()) .filter(v -> MyDateTimeUtils.dateValidFilter(v.getSignDate(), begin, verifyDate, 7)) .findFirst().orElse(null); if (vendorFile == null) { // 检索最后一个有效评价表 - CompanyVendorFileVo latestFile = files.stream() + VendorFileVo latestFile = files.stream() .filter(v -> v.getSignDate() != null && v.isValid()) - .max(Comparator.comparing(CompanyVendorFileVo::getSignDate)) + .max(Comparator.comparing(VendorFileVo::getSignDate)) .orElse(null); if (latestFile == null) { @@ -67,7 +67,7 @@ public class CompanyVendorFileService extends QueryService findAllByVendorAndType(CompanyVendorVo vendor, VendorFileType type) { + public List findAllByVendorAndType(VendorVo vendor, VendorFileType type) { return findAll(ParamUtils.builder() .equals("vendor", vendor.getId()) .equals("type", type.name()) diff --git a/client/src/main/java/com/ecep/contract/service/CompanyVendorService.java b/client/src/main/java/com/ecep/contract/service/VendorService.java similarity index 88% rename from client/src/main/java/com/ecep/contract/service/CompanyVendorService.java rename to client/src/main/java/com/ecep/contract/service/VendorService.java index 69821de..661fe7e 100644 --- a/client/src/main/java/com/ecep/contract/service/CompanyVendorService.java +++ b/client/src/main/java/com/ecep/contract/service/VendorService.java @@ -20,12 +20,12 @@ import com.ecep.contract.util.FileUtils; import com.ecep.contract.util.MyStringUtils; import com.ecep.contract.util.ParamUtils; import com.ecep.contract.vm.CompanyVendorViewModel; -import com.ecep.contract.vo.CompanyVendorVo; +import com.ecep.contract.vo.VendorVo; import com.ecep.contract.vo.CompanyVo; import com.ecep.contract.vo.ContractVo; @Service -public class CompanyVendorService extends QueryService { +public class CompanyVendorService extends QueryService { @Autowired private CompanyService companyService; @Autowired @@ -52,15 +52,15 @@ public class CompanyVendorService extends QueryService page = findAll(ParamUtils.equal("company", company.getId()), Pageable.ofSize(1)); + public VendorVo findByCompany(CompanyVo company) { + Page page = findAll(ParamUtils.equal("company", company.getId()), Pageable.ofSize(1)); if (page.isEmpty()) { return null; } return page.getContent().getFirst(); } - public boolean reBuildingFiles(CompanyVendorVo companyVendor, MessageHolder messageHolder) { + public boolean reBuildingFiles(VendorVo companyVendor, MessageHolder messageHolder) { // TODO Auto-generated method stub throw new UnsupportedOperationException("Unimplemented method 'reBuildingFiles'"); } @@ -76,7 +76,7 @@ public class CompanyVendorService extends QueryService { +public class VendorApprovedList implements IdentityEntity, Serializable, Voable { private static final long serialVersionUID = 1L; @Id @@ -67,7 +67,7 @@ public class CompanyVendorApprovedList implements IdentityEntity, Serializable, if (HibernateProxyUtils.isNotEffectiveClassEquals(object, this)) { return false; } - CompanyVendorApprovedList that = (CompanyVendorApprovedList) object; + VendorApprovedList that = (VendorApprovedList) object; return getId() != null && Objects.equals(getId(), that.getId()); } diff --git a/common/src/main/java/com/ecep/contract/model/CompanyVendorApprovedFile.java b/common/src/main/java/com/ecep/contract/model/VendorApprovedFile.java similarity index 98% rename from common/src/main/java/com/ecep/contract/model/CompanyVendorApprovedFile.java rename to common/src/main/java/com/ecep/contract/model/VendorApprovedFile.java index 04d4fa2..ed00068 100644 --- a/common/src/main/java/com/ecep/contract/model/CompanyVendorApprovedFile.java +++ b/common/src/main/java/com/ecep/contract/model/VendorApprovedFile.java @@ -38,7 +38,7 @@ public class CompanyVendorApprovedFile implements IdentityEntity, Serializable, @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "LIST_ID", nullable = false) @ToString.Exclude - private CompanyVendorApprovedList list; + private VendorApprovedList list; /** * 文件名，不含目录，目录使用目录的目录 diff --git a/common/src/main/java/com/ecep/contract/model/CompanyVendorApprovedItem.java b/common/src/main/java/com/ecep/contract/model/VendorApprovedItem.java similarity index 98% rename from common/src/main/java/com/ecep/contract/model/CompanyVendorApprovedItem.java rename to common/src/main/java/com/ecep/contract/model/VendorApprovedItem.java index a26bec7..207b5d1 100644 --- a/common/src/main/java/com/ecep/contract/model/CompanyVendorApprovedItem.java +++ b/common/src/main/java/com/ecep/contract/model/VendorApprovedItem.java @@ -39,7 +39,7 @@ public class CompanyVendorApprovedItem implements IdentityEntity, Serializable, @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "LIST_ID", nullable = false) @ToString.Exclude - private CompanyVendorApprovedList list; + private VendorApprovedList list; /** * 供应商名称，有可能改名了，所以存历史名称 diff --git a/common/src/main/java/com/ecep/contract/model/CompanyVendorEntity.java b/common/src/main/java/com/ecep/contract/model/VendorEntity.java similarity index 100% rename from common/src/main/java/com/ecep/contract/model/CompanyVendorEntity.java rename to common/src/main/java/com/ecep/contract/model/VendorEntity.java diff --git a/common/src/main/java/com/ecep/contract/model/CompanyVendorFile.java b/common/src/main/java/com/ecep/contract/model/VendorFile.java similarity index 100% rename from common/src/main/java/com/ecep/contract/model/CompanyVendorFile.java rename to common/src/main/java/com/ecep/contract/model/VendorFile.java diff --git a/common/src/main/java/com/ecep/contract/vo/CompanyVendorApprovedFileVo.java b/common/src/main/java/com/ecep/contract/vo/VendorApprovedFileVo.java similarity index 100% rename from common/src/main/java/com/ecep/contract/vo/CompanyVendorApprovedFileVo.java rename to common/src/main/java/com/ecep/contract/vo/VendorApprovedFileVo.java diff --git a/common/src/main/java/com/ecep/contract/vo/CompanyVendorApprovedItemVo.java b/common/src/main/java/com/ecep/contract/vo/VendorApprovedItemVo.java similarity index 100% rename from common/src/main/java/com/ecep/contract/vo/CompanyVendorApprovedItemVo.java rename to common/src/main/java/com/ecep/contract/vo/VendorApprovedItemVo.java diff --git a/common/src/main/java/com/ecep/contract/vo/CompanyVendorApprovedListVo.java b/common/src/main/java/com/ecep/contract/vo/VendorApprovedVo.java similarity index 100% rename from common/src/main/java/com/ecep/contract/vo/CompanyVendorApprovedListVo.java rename to common/src/main/java/com/ecep/contract/vo/VendorApprovedVo.java diff --git a/common/src/main/java/com/ecep/contract/vo/CompanyVendorEntityVo.java b/common/src/main/java/com/ecep/contract/vo/VendorEntityVo.java similarity index 100% rename from common/src/main/java/com/ecep/contract/vo/CompanyVendorEntityVo.java rename to common/src/main/java/com/ecep/contract/vo/VendorEntityVo.java diff --git a/common/src/main/java/com/ecep/contract/vo/CompanyVendorFileVo.java b/common/src/main/java/com/ecep/contract/vo/VendorFileVo.java similarity index 100% rename from common/src/main/java/com/ecep/contract/vo/CompanyVendorFileVo.java rename to common/src/main/java/com/ecep/contract/vo/VendorFileVo.java diff --git a/common/src/main/java/com/ecep/contract/vo/CompanyVendorVo.java b/common/src/main/java/com/ecep/contract/vo/VendorVo.java similarity index 100% rename from common/src/main/java/com/ecep/contract/vo/CompanyVendorVo.java rename to common/src/main/java/com/ecep/contract/vo/VendorVo.java diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/model/CompanyVendor.sql b/docs/db/CompanyVendor.sql similarity index 100% rename from server/src/main/java/com/ecep/contract/ds/vendor/model/CompanyVendor.sql rename to docs/db/CompanyVendor.sql diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/repository/CompanyVendorApprovedFileRepository.java b/server/src/main/java/com/ecep/contract/ds/vendor/repository/CompanyVendorApprovedFileRepository.java deleted file mode 100644 index 3bb7179..0000000 --- a/server/src/main/java/com/ecep/contract/ds/vendor/repository/CompanyVendorApprovedFileRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ecep.contract.ds.vendor.repository; - -import java.util.List; - -import org.springframework.stereotype.Repository; - -import com.ecep.contract.ds.MyRepository; -import com.ecep.contract.model.CompanyVendorApprovedFile; - -@Repository -public interface CompanyVendorApprovedFileRepository extends MyRepository { - - List findAllByListId(int listId); - - CompanyVendorApprovedFile findByListIdAndFileName(int listId, String fileName); -} \ No newline at end of file diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/repository/CompanyVendorApprovedItemRepository.java b/server/src/main/java/com/ecep/contract/ds/vendor/repository/CompanyVendorApprovedItemRepository.java deleted file mode 100644 index af27553..0000000 --- a/server/src/main/java/com/ecep/contract/ds/vendor/repository/CompanyVendorApprovedItemRepository.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.ecep.contract.ds.vendor.repository; - -import java.util.List; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import org.springframework.stereotype.Repository; - -import com.ecep.contract.model.Vendor; -import com.ecep.contract.model.CompanyVendorApprovedItem; -import com.ecep.contract.model.CompanyVendorApprovedList; - -/** - * 合格供方名录 - */ -@Repository -public interface CompanyVendorApprovedItemRepository extends - JpaRepository, JpaSpecificationExecutor { - - List findAllByList(CompanyVendorApprovedList list); - - List findAllByListAndVendor(CompanyVendorApprovedList list, Vendor vendor); - - CompanyVendorApprovedItem findByListAndVendor(CompanyVendorApprovedList list, Vendor vendor); -} diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorApprovedFileRepository.java b/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorApprovedFileRepository.java new file mode 100644 index 0000000..648804d --- /dev/null +++ b/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorApprovedFileRepository.java @@ -0,0 +1,16 @@ +package com.ecep.contract.ds.vendor.repository; + +import java.util.List; + +import org.springframework.stereotype.Repository; + +import com.ecep.contract.ds.MyRepository; +import com.ecep.contract.model.VendorApprovedFile; + +@Repository +public interface CompanyVendorApprovedFileRepository extends MyRepository { + + List findAllByListId(int listId); + + VendorApprovedFile findByListIdAndFileName(int listId, String fileName); +} \ No newline at end of file diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorApprovedItemRepository.java b/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorApprovedItemRepository.java new file mode 100644 index 0000000..52a689f --- /dev/null +++ b/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorApprovedItemRepository.java @@ -0,0 +1,25 @@ +package com.ecep.contract.ds.vendor.repository; + +import java.util.List; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.stereotype.Repository; + +import com.ecep.contract.model.Vendor; +import com.ecep.contract.model.VendorApprovedItem; +import com.ecep.contract.model.VendorApproved; + +/** + * 合格供方名录 + */ +@Repository +public interface CompanyVendorApprovedItemRepository extends + JpaRepository, JpaSpecificationExecutor { + + List findAllByList(VendorApproved list); + + List findAllByListAndVendor(VendorApproved list, Vendor vendor); + + VendorApprovedItem findByListAndVendor(VendorApproved list, Vendor vendor); +} diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/repository/CompanyVendorApprovedListRepository.java b/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorApprovedRepository.java similarity index 67% rename from server/src/main/java/com/ecep/contract/ds/vendor/repository/CompanyVendorApprovedListRepository.java rename to server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorApprovedRepository.java index e1950b1..e92fdf8 100644 --- a/server/src/main/java/com/ecep/contract/ds/vendor/repository/CompanyVendorApprovedListRepository.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorApprovedRepository.java @@ -4,14 +4,14 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.stereotype.Repository; -import com.ecep.contract.model.CompanyVendorApprovedList; +import com.ecep.contract.model.VendorApproved; /** * 合格供方名录 */ @Repository public interface CompanyVendorApprovedListRepository extends - JpaRepository, JpaSpecificationExecutor + JpaRepository, JpaSpecificationExecutor diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/repository/CompanyVendorEntityRepository.java b/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorEntityRepository.java similarity index 60% rename from server/src/main/java/com/ecep/contract/ds/vendor/repository/CompanyVendorEntityRepository.java rename to server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorEntityRepository.java index f671921..6806a11 100644 --- a/server/src/main/java/com/ecep/contract/ds/vendor/repository/CompanyVendorEntityRepository.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorEntityRepository.java @@ -7,12 +7,12 @@ import org.springframework.stereotype.Repository; import com.ecep.contract.ds.MyRepository; import com.ecep.contract.model.Vendor; -import com.ecep.contract.model.CompanyVendorEntity; +import com.ecep.contract.model.VendorEntity; @Repository -public interface CompanyVendorEntityRepository extends MyRepository { - Optional findByCode(String code); +public interface CompanyVendorEntityRepository extends MyRepository { + Optional findByCode(String code); - List findByVendor(Vendor vendor); + List findByVendor(Vendor vendor); } diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/repository/CompanyVendorFileRepository.java b/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorFileRepository.java similarity index 52% rename from server/src/main/java/com/ecep/contract/ds/vendor/repository/CompanyVendorFileRepository.java rename to server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorFileRepository.java index 3a7e3a4..b7b9a54 100644 --- a/server/src/main/java/com/ecep/contract/ds/vendor/repository/CompanyVendorFileRepository.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorFileRepository.java @@ -8,15 +8,15 @@ import org.springframework.stereotype.Repository; import com.ecep.contract.VendorFileType; import com.ecep.contract.model.Vendor; -import com.ecep.contract.model.CompanyVendorFile; +import com.ecep.contract.model.VendorFile; @Repository public interface CompanyVendorFileRepository - extends JpaRepository, JpaSpecificationExecutor { + extends JpaRepository, JpaSpecificationExecutor { - List findAllByVendorId(int vendorId); + List findAllByVendorId(int vendorId); - List findAllByVendorAndType(Vendor vendor, VendorFileType type); + List findAllByVendorAndType(Vendor vendor, VendorFileType type); - List findByVendorId(int vendorId); + List findByVendorId(int vendorId); } \ No newline at end of file diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/repository/CompanyVendorRepository.java b/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorRepository.java similarity index 100% rename from server/src/main/java/com/ecep/contract/ds/vendor/repository/CompanyVendorRepository.java rename to server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorRepository.java diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/service/CompanyVendorApprovedFileService.java b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedFileService.java similarity index 77% rename from server/src/main/java/com/ecep/contract/ds/vendor/service/CompanyVendorApprovedFileService.java rename to server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedFileService.java index 1e51bba..7faa715 100644 --- a/server/src/main/java/com/ecep/contract/ds/vendor/service/CompanyVendorApprovedFileService.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedFileService.java @@ -11,12 +11,12 @@ import org.springframework.stereotype.Service; import com.ecep.contract.IEntityService; import com.ecep.contract.ds.vendor.repository.CompanyVendorApprovedFileRepository; -import com.ecep.contract.model.CompanyVendorApprovedFile; -import com.ecep.contract.model.CompanyVendorApprovedList; +import com.ecep.contract.model.VendorApprovedFile; +import com.ecep.contract.model.VendorApproved; @Lazy @Service -public class CompanyVendorApprovedFileService implements IEntityService { +public class CompanyVendorApprovedFileService implements IEntityService { @Lazy @Autowired private CompanyVendorApprovedFileRepository repository; @@ -28,7 +28,7 @@ public class CompanyVendorApprovedFileService implements IEntityService getSpecification(String searchText) { + public Specification getSpecification(String searchText) { return (root, query, builder) -> { return builder.or( builder.like(root.get("fileName"), "%" + searchText + "%"), @@ -57,7 +57,7 @@ public class CompanyVendorApprovedFileService implements IEntityService findAll(Specification spec, Pageable pageable) { + public Page findAll(Specification spec, Pageable pageable) { return repository.findAll(spec, pageable); } @@ -67,7 +67,7 @@ public class CompanyVendorApprovedFileService implements IEntityService findAllByList(CompanyVendorApprovedList list) { + public List findAllByList(VendorApproved list) { return repository.findAllByListId(list.getId()); } } \ No newline at end of file diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/service/CompanyVendorApprovedItemService.java b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedItemService.java similarity index 75% rename from server/src/main/java/com/ecep/contract/ds/vendor/service/CompanyVendorApprovedItemService.java rename to server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedItemService.java index eec4dcf..d625854 100644 --- a/server/src/main/java/com/ecep/contract/ds/vendor/service/CompanyVendorApprovedItemService.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedItemService.java @@ -20,15 +20,15 @@ import com.ecep.contract.ds.vendor.repository.CompanyVendorApprovedItemRepositor import com.ecep.contract.model.Company; import com.ecep.contract.model.CompanyOldName; import com.ecep.contract.model.Vendor; -import com.ecep.contract.model.CompanyVendorApprovedItem; -import com.ecep.contract.model.CompanyVendorApprovedList; +import com.ecep.contract.model.VendorApprovedItem; +import com.ecep.contract.model.VendorApproved; import jakarta.persistence.criteria.Path; import jakarta.persistence.criteria.Predicate; @Lazy @Service -public class CompanyVendorApprovedItemService implements IEntityService, QueryService { +public class CompanyVendorApprovedItemService implements IEntityService, QueryService { @Lazy @Autowired private CompanyVendorApprovedItemRepository repository; @@ -37,12 +37,12 @@ public class CompanyVendorApprovedItemService implements IEntityService getSpecification(String searchText) { + public Specification getSpecification(String searchText) { return (root, query, builder) -> { Path vendor = root.get("vendor"); Path company = vendor.get("company"); @@ -66,27 +66,27 @@ public class CompanyVendorApprovedItemService implements IEntityService findAll(Specification spec, Pageable pageable) { + public Page findAll(Specification spec, Pageable pageable) { return repository.findAll(spec, pageable); } @Override - public void delete(CompanyVendorApprovedItem entity) { + public void delete(VendorApprovedItem entity) { repository.delete(entity); } @Override - public CompanyVendorApprovedItem save(CompanyVendorApprovedItem entity) { + public VendorApprovedItem save(VendorApprovedItem entity) { return repository.save(entity); } - public List findAll(Specification spec, Sort sort) { + public List findAll(Specification spec, Sort sort) { return repository.findAll(spec, sort); } @Override - public Page findAll(JsonNode paramsNode, Pageable pageable) { - Specification spec = null; + public Page findAll(JsonNode paramsNode, Pageable pageable) { + Specification spec = null; if (paramsNode.has("searchText")) { spec = getSpecification(paramsNode.get("searchText").asText()); } @@ -95,7 +95,7 @@ public class CompanyVendorApprovedItemService implements IEntityService findAllByListAndVendor(CompanyVendorApprovedList approvedList, Vendor vendor) { + public List findAllByListAndVendor(VendorApproved approvedList, Vendor vendor) { return repository.findAllByListAndVendor(approvedList, vendor); } } diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/service/CompanyVendorApprovedListService.java b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedService.java similarity index 76% rename from server/src/main/java/com/ecep/contract/ds/vendor/service/CompanyVendorApprovedListService.java rename to server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedService.java index 5cddbce..e7ebee6 100644 --- a/server/src/main/java/com/ecep/contract/ds/vendor/service/CompanyVendorApprovedListService.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedService.java @@ -7,8 +7,8 @@ import com.ecep.contract.QueryService; import com.ecep.contract.constant.CompanyVendorConstant; import com.ecep.contract.ds.other.service.SysConfService; import com.ecep.contract.ds.vendor.repository.CompanyVendorApprovedListRepository; -import com.ecep.contract.model.CompanyVendorApprovedFile; -import com.ecep.contract.model.CompanyVendorApprovedList; +import com.ecep.contract.model.VendorApprovedFile; +import com.ecep.contract.model.VendorApproved; import com.ecep.contract.util.FileUtils; import com.ecep.contract.util.SpecificationUtils; import com.fasterxml.jackson.databind.JsonNode; @@ -33,7 +33,7 @@ import java.util.function.Consumer; @Lazy @Service -public class CompanyVendorApprovedListService implements IEntityService, QueryService { +public class CompanyVendorApprovedListService implements IEntityService, QueryService { private static final Logger logger = LoggerFactory.getLogger(CompanyVendorApprovedListService.class); @Lazy @Autowired @@ -54,18 +54,18 @@ public class CompanyVendorApprovedListService implements IEntityService findAll(Specification spec, Pageable pageable) { + public Page findAll(Specification spec, Pageable pageable) { return repository.findAll(spec, pageable); } @Override - public Page findAll(JsonNode paramsNode, Pageable pageable) { - Specification spec = null; + public Page findAll(JsonNode paramsNode, Pageable pageable) { + Specification spec = null; if (paramsNode.has("searchText")) { spec = getSpecification(paramsNode.get("searchText").asText()); } @@ -75,7 +75,7 @@ public class CompanyVendorApprovedListService implements IEntityService getSpecification(String searchText) { + public Specification getSpecification(String searchText) { if (!StringUtils.hasText(searchText)) { return null; } @@ -84,20 +84,20 @@ public class CompanyVendorApprovedListService implements IEntityService findAll(Specification spec, PageRequest pageRequest) { + public Page findAll(Specification spec, PageRequest pageRequest) { return repository.findAll(spec, pageRequest); } - public boolean makePathAbsent(CompanyVendorApprovedList list) { + public boolean makePathAbsent(VendorApproved list) { String path = list.getPath(); if (StringUtils.hasText(path)) { File file = new File(path); @@ -117,7 +117,7 @@ public class CompanyVendorApprovedListService implements IEntityService, QueryService { +public class CompanyVendorEntityService implements IEntityService, QueryService { @Lazy @Autowired private CompanyVendorEntityRepository repository; @Cacheable(key = "#p0") @Override - public CompanyVendorEntity findById(Integer id) { + public VendorEntity findById(Integer id) { return repository.findById(id).orElse(null); } @@ -43,19 +43,19 @@ public class CompanyVendorEntityService implements IEntityService getSpecification(String searchText) { + public Specification getSpecification(String searchText) { if (!StringUtils.hasText(searchText)) { return null; } return SpecificationUtils.andWith(searchText, this::buildSearchSpecification); } - protected Specification buildSearchSpecification(String searchText) { + protected Specification buildSearchSpecification(String searchText) { return (root, query, builder) -> { return builder.or( builder.like(root.get("name"), "%" + searchText + "%"), @@ -66,19 +66,19 @@ public class CompanyVendorEntityService implements IEntityService search(String searchText) { - Specification spec = getSpecification(searchText); + public List search(String searchText) { + Specification spec = getSpecification(searchText); return repository.findAll(spec, Pageable.ofSize(10)).getContent(); } @Override - public Page findAll(Specification spec, Pageable pageable) { + public Page findAll(Specification spec, Pageable pageable) { return repository.findAll(spec, pageable); } @Override - public Page findAll(JsonNode paramsNode, Pageable pageable) { - Specification spec = null; + public Page findAll(JsonNode paramsNode, Pageable pageable) { + Specification spec = null; if (paramsNode.has("searchText")) { spec = getSpecification(paramsNode.get("searchText").asText()); } @@ -94,7 +94,7 @@ public class CompanyVendorEntityService implements IEntityService findAllByVendor(Vendor vendor) { + public List findAllByVendor(Vendor vendor) { return repository.findByVendor(vendor); } } \ No newline at end of file diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/service/CompanyVendorFileService.java b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorFileService.java similarity index 83% rename from server/src/main/java/com/ecep/contract/ds/vendor/service/CompanyVendorFileService.java rename to server/src/main/java/com/ecep/contract/ds/vendor/service/VendorFileService.java index 80dae36..a0f651d 100644 --- a/server/src/main/java/com/ecep/contract/ds/vendor/service/CompanyVendorFileService.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorFileService.java @@ -24,13 +24,13 @@ import com.ecep.contract.ds.contract.service.ContractFileService; import com.ecep.contract.ds.contract.service.ContractService; import com.ecep.contract.ds.vendor.repository.CompanyVendorFileRepository; import com.ecep.contract.model.Vendor; -import com.ecep.contract.model.CompanyVendorFile; +import com.ecep.contract.model.VendorFile; import com.ecep.contract.model.Contract; @Lazy @Service -public class CompanyVendorFileService implements IEntityService, QueryService { +public class CompanyVendorFileService implements IEntityService, QueryService { private static final Logger logger = LoggerFactory.getLogger(CompanyVendorFileService.class); @@ -40,25 +40,25 @@ public class CompanyVendorFileService implements IEntityService getSpecification(String searchText) { + public Specification getSpecification(String searchText) { return (root, query, builder) -> { return builder.or(builder.like(root.get("filePath"), "%" + searchText + "%")); }; } @Override - public Page findAll(Specification spec, Pageable pageable) { + public Page findAll(Specification spec, Pageable pageable) { return repository.findAll(spec, pageable); } @Override - public Page findAll(JsonNode paramsNode, Pageable pageable) { - Specification spec = null; + public Page findAll(JsonNode paramsNode, Pageable pageable) { + Specification spec = null; if (paramsNode.has("searchText")) { spec = getSpecification(paramsNode.get("searchText").asText()); } @@ -72,11 +72,11 @@ public class CompanyVendorFileService implements IEntityService findAllByVendor(Vendor vendor) { + public List findAllByVendor(Vendor vendor) { return repository.findAllByVendorId(vendor.getId()); } - public void delete(CompanyVendorFile file) { + public void delete(VendorFile file) { repository.delete(file); } @@ -84,19 +84,19 @@ public class CompanyVendorFileService implements IEntityService files) { + public void saveAll(List files) { repository.saveAll(files); } - public CompanyVendorFile save(CompanyVendorFile file) { + public VendorFile save(VendorFile file) { return repository.save(file); } - public List findAll(Specification spec, Sort sort) { + public List findAll(Specification spec, Sort sort) { return repository.findAll(spec, sort); } - public List findAllByVendorAndType(Vendor vendor, VendorFileType type) { + public List findAllByVendorAndType(Vendor vendor, VendorFileType type) { return repository.findAllByVendorAndType(vendor, type); } @@ -115,7 +115,7 @@ public class CompanyVendorFileService implements IEntityService files = findAllByVendorAndType(vendor, VendorFileType.EvaluationForm); + List files = findAllByVendorAndType(vendor, VendorFileType.EvaluationForm); if (files == null || files.isEmpty()) { holder.error("未见供应商评价"); return; @@ -123,15 +123,15 @@ public class CompanyVendorFileService implements IEntityService v.getSignDate() != null && v.isValid()) .filter(v -> MyDateTimeUtils.dateValidFilter(v.getSignDate(), begin, verifyDate, 7)) .findFirst().orElse(null); if (vendorFile == null) { // 检索最后一个有效评价表 - CompanyVendorFile latestFile = files.stream() + VendorFile latestFile = files.stream() .filter(v -> v.getSignDate() != null && v.isValid()) - .max(Comparator.comparing(CompanyVendorFile::getSignDate)) + .max(Comparator.comparing(VendorFile::getSignDate)) .orElse(null); if (latestFile == null) { @@ -160,10 +160,10 @@ public class CompanyVendorFileService implements IEntityService files = findAllByVendorAndType(vendor, VendorFileType.EvaluationForm); - CompanyVendorFile latestFile = files.stream() + List files = findAllByVendorAndType(vendor, VendorFileType.EvaluationForm); + VendorFile latestFile = files.stream() .filter(v -> v.getSignDate() != null && v.isValid()) - .max(Comparator.comparing(CompanyVendorFile::getSignDate)) + .max(Comparator.comparing(VendorFile::getSignDate)) .orElse(null); // 没有有效的评价表的评价日期 diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/service/CompanyVendorService.java b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorService.java similarity index 96% rename from server/src/main/java/com/ecep/contract/ds/vendor/service/CompanyVendorService.java rename to server/src/main/java/com/ecep/contract/ds/vendor/service/VendorService.java index 216b7de..211da8f 100644 --- a/server/src/main/java/com/ecep/contract/ds/vendor/service/CompanyVendorService.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorService.java @@ -125,11 +125,11 @@ public class CompanyVendorService extends CompanyBasicService } catch (Exception ignored) { } } - List searched = companyVendorEntityService.search(searchText); + List searched = companyVendorEntityService.search(searchText); if (!searched.isEmpty()) { nameSpec = SpecificationUtils.or(nameSpec, (root, query, builder) -> { return builder.in(root.get("id")).value(searched.stream() - .map(CompanyVendorEntity::getVendor) + .map(VendorEntity::getVendor) .filter(Objects::nonNull) .map(Vendor::getId) .collect(Collectors.toSet())); @@ -146,7 +146,7 @@ public class CompanyVendorService extends CompanyBasicService @Override public , ID> void deleteFile(F file) { - companyVendorFileService.delete((CompanyVendorFile) file); + companyVendorFileService.delete((VendorFile) file); } public File getBasePath() { @@ -160,15 +160,15 @@ public class CompanyVendorService extends CompanyBasicService * @param status 输出 */ public boolean reBuildingFiles(Vendor vendor, Consumer status) { - List dbFiles = companyVendorFileService.findAllByVendor(vendor); - Map map = new HashMap<>(); + List dbFiles = companyVendorFileService.findAllByVendor(vendor); + Map map = new HashMap<>(); boolean modified = fetchDbFiles(dbFiles, map, status); // 供应商目录下，准备用于移动到公司目录 List needMoveToCompanyPath = new ArrayList<>(); // 有修改和新导入的文件 - List retrieveFiles = new ArrayList<>(); + List retrieveFiles = new ArrayList<>(); // TODO 供应商有曾用名，可能存在多个目录 fetchFiles(vendor.getPath(), needMoveToCompanyPath, retrieveFiles, map, status); @@ -193,7 +193,7 @@ public class CompanyVendorService extends CompanyBasicService Consumer status) { dbFile.setType((T) VendorFileType.General); fillFile(dbFile, file, null, status); - companyVendorFileService.save((CompanyVendorFile) dbFile); + companyVendorFileService.save((VendorFile) dbFile); return true; } @@ -201,7 +201,7 @@ public class CompanyVendorService extends CompanyBasicService @Override protected > F fillFileType(File file, List fileList, Consumer status) { - CompanyVendorFile vendorFile = new CompanyVendorFile(); + VendorFile vendorFile = new VendorFile(); vendorFile.setType(VendorFileType.General); vendorFile.setFilePath(file.getAbsolutePath()); fillFile(vendorFile, file, fileList, status);