From 9561ad99e6860e6b42c2625f258b2809fe424bd6 Mon Sep 17 00:00:00 2001 From: songqq Date: Tue, 23 Sep 2025 23:37:44 +0800 Subject: [PATCH] =?UTF-8?q?refactor(vendor):=20=E9=87=8D=E6=9E=84=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E7=9B=B8=E5=85=B3=E7=B1=BB=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E5=92=8C=E5=8C=85=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将CompanyVendor前缀的类重命名为Vendor前缀，优化包结构 调整供应商相关控制器、服务、仓库类的命名和位置 修复TableViewUtils中的类型安全警告 更新FXML文件中的控制器引用路径 --- .trae/rules/project_rules.md | 3 + README.md | 202 +++++++++++++++++- .../controller/HomeWindowController.java | 7 +- .../cloud/rk/CloudRkManagerSkin.java | 3 +- .../rk/CloudRkManagerWindowController.java | 3 +- .../cloud/tyc/CloudTycManagerSkin.java | 3 +- .../tyc/CloudTycManagerWindowController.java | 3 +- .../u8/YongYouU8ConfigWindowController.java | 3 +- .../cloud/u8/YongYouU8ManagerSkin.java | 6 +- .../u8/YongYouU8ManagerWindowController.java | 9 +- .../company/CompanyWindowController.java | 14 +- .../bank_account/BankAccountBaseTabSkin.java | 2 +- .../BankAccountWindowController.java | 3 +- .../old_name/CompanyOldNameTabSkinBase.java | 2 +- .../old_name/CompanyOldNameTabSkinFile.java | 5 +- .../CompanyOldNameWindowController.java | 2 +- .../ContractTabSkinExtendVendorInfo.java | 6 +- .../project/ProjectManagerSkin.java | 2 +- .../project/ProjectTabSkinBase.java | 5 +- .../tab/CompanyTabSkinBankAccount.java | 3 +- .../tab/CompanyTabSkinContract.java | 10 +- .../controller/tab/CompanyTabSkinOldName.java | 4 +- .../controller/tab/ContractManagerSkin.java | 2 +- .../controller/tab/ContractTabSkinBase.java | 26 +-- .../tab/ContractTabSkinPurchaseOrders.java | 3 +- .../tab/ContractTabSkinVendorBid.java | 7 +- .../controller/tab/ContractUpdater.java | 15 +- .../controller/tab/VendorBidTabSkinBase.java | 5 +- .../table/cell/CompanyVendorTableCell.java | 24 +-- .../vendor/AbstVendorTableTabSkin.java | 6 +- .../controller/vendor/VendorManagerSkin.java | 10 +- .../vendor/VendorManagerWindowController.java | 12 +- .../controller/vendor/VendorTabSkinBase.java | 8 +- .../vendor/VendorTabSkinEntity.java | 6 +- .../controller/vendor/VendorTabSkinFile.java | 56 ++--- .../vendor/VendorWindowController.java | 10 +- .../VendorApprovedListManagerSkin.java | 10 +- ...orApprovedListManagerWindowController.java | 8 +- .../VendorApprovedListTabSkinBase.java | 6 +- .../VendorApprovedListTabSkinFiles.java | 6 +- .../VendorApprovedListTabSkinVendors.java | 14 +- .../VendorApprovedListVendorExportTask.java | 6 +- .../VendorApprovedListVendorImportTask.java | 6 +- .../VendorApprovedListWindowController.java | 14 +- .../vendor/bid/VendorBidWindowController.java | 2 +- .../order/PurchaseOrderTabSkinBase.java | 1 - .../PurchaseOrderTabSkinBillVoucher.java | 7 +- .../order/PurchaseOrderTabSkinItems.java | 4 - .../order/PurchaseOrderWindowController.java | 5 +- .../PurchaseBillVoucherTabSkinItems.java | 9 - .../PurchaseBillVoucherWindowController.java | 3 +- .../converter/VendorStringConverter.java | 4 +- .../contract/service/ContractService.java | 5 +- .../service/VendorApprovedFileService.java | 2 +- .../service/VendorApprovedItemService.java | 2 +- .../service/VendorApprovedService.java | 2 +- .../contract/service/VendorEntityService.java | 2 +- .../contract/service/VendorFileService.java | 2 +- .../ecep/contract/service/VendorService.java | 6 +- .../contract/task/ContractGroupSyncTask.java | 3 +- .../contract/task/ContractKindSyncTask.java | 3 +- .../contract/task/ContractSyncAllTask.java | 3 +- .../contract/task/ContractTypeSyncTask.java | 3 +- .../contract/task/ContractVerifyComm.java | 35 +-- .../contract/task/CustomerClassSyncTask.java | 3 +- .../contract/task/VendorClassSyncTask.java | 3 +- .../com/ecep/contract/util/ComboBoxUtils.java | 2 +- .../ecep/contract/util/TableViewUtils.java | 2 +- .../CompanyVendorApprovedFileViewModel.java | 10 +- .../CompanyVendorApprovedItemViewModel.java | 10 +- .../CompanyVendorApprovedListViewModel.java | 10 +- .../vm/CompanyVendorEntityViewModel.java | 8 +- .../vm/CompanyVendorFileViewModel.java | 10 +- .../contract/vm/CompanyVendorViewModel.java | 10 +- .../contract/vm/VendorEntityViewModel.java | 10 +- .../main/resources/ui/cloud/u8_manager.fxml | 2 +- .../resources/ui/company/bank-account.fxml | 2 +- .../ui/company/company_old_name.fxml | 2 +- .../ui/company/vendor/vendor-tab-entity.fxml | 2 +- .../resources/ui/company/vendor/vendor.fxml | 2 +- .../vendor/vendor_approved_list-tab-file.fxml | 2 +- .../vendor_approved_list-tab-vendor.fxml | 2 +- .../company/vendor/vendor_approved_list.fxml | 2 +- .../vendor/vendor_approved_list_manager.fxml | 2 +- .../ui/company/vendor/vendor_manager.fxml | 2 +- .../java/com/ecep/contract/model/Vendor.java | 10 +- .../ecep/contract/model/VendorApproved.java | 10 +- .../contract/model/VendorApprovedFile.java | 12 +- .../contract/model/VendorApprovedItem.java | 12 +- .../com/ecep/contract/model/VendorEntity.java | 10 +- .../com/ecep/contract/model/VendorFile.java | 10 +- .../contract/vo/VendorApprovedFileVo.java | 2 +- .../contract/vo/VendorApprovedItemVo.java | 2 +- .../ecep/contract/vo/VendorApprovedVo.java | 2 +- .../com/ecep/contract/vo/VendorEntityVo.java | 2 +- .../com/ecep/contract/vo/VendorFileVo.java | 2 +- .../java/com/ecep/contract/vo/VendorVo.java | 2 +- .../cloud/old/CompanyVendorFileUtils.java | 4 +- .../contract/cloud/old/OldVersionService.java | 27 ++- .../cloud/old/OldVersionSyncVendorTask.java | 4 +- .../contract/cloud/u8/VendorSyncTask.java | 32 +-- .../contract/cloud/u8/YongYouU8Service.java | 4 +- .../cloud/u8/ctx/AbstractYongYouU8Ctx.java | 20 +- .../contract/cloud/u8/ctx/ContractCtx.java | 20 +- .../cloud/u8/ctx/PurchaseBillVoucherCtx.java | 8 +- .../ecep/contract/cloud/u8/ctx/VendorCtx.java | 38 ++-- .../company/service/CompanyBasicService.java | 4 +- .../ds/company/service/CompanyService.java | 14 +- .../contract/tasker/ContractVerifyComm.java | 14 +- .../service/CompanyCustomerService.java | 5 +- .../VendorApprovedFileRepository.java | 2 +- .../VendorApprovedItemRepository.java | 2 +- .../repository/VendorApprovedRepository.java | 2 +- .../repository/VendorEntityRepository.java | 2 +- .../repository/VendorFileRepository.java | 2 +- .../vendor/repository/VendorRepository.java | 2 +- .../service/VendorApprovedFileService.java | 6 +- .../service/VendorApprovedItemService.java | 6 +- .../vendor/service/VendorApprovedService.java | 12 +- .../vendor/service/VendorEntityService.java | 6 +- .../ds/vendor/service/VendorFileService.java | 8 +- .../VendorGroupRequireFileTypeService.java | 2 - .../ds/vendor/service/VendorService.java | 46 ++-- .../ds/vendor/task/VendorVerifyAllTasker.java | 4 +- 124 files changed, 613 insertions(+), 520 deletions(-) diff --git a/.trae/rules/project_rules.md b/.trae/rules/project_rules.md index 4a81c3e..06e3a7a 100644 --- a/.trae/rules/project_rules.md +++ b/.trae/rules/project_rules.md @@ -1,3 +1,5 @@ + + # server 模块 Java 21 Spring Boot 3.3.7 @@ -17,6 +19,7 @@ caffeine 3.1.8 .fxml 界面UI, /client/src/main/resources/ui/ 目录下 websocket 与 server 模块通信 +# common 模块 ignore: - .idea diff --git a/README.md b/README.md index 28c66e5..189bbf6 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,197 @@ -# 项目介绍 +# Contract-Manager 项目分析报告 -分模块： -- common: -公共模块，包含实体类、公共的类、枚举、异常、工具类等 -- server: -服务端模块，包含服务端的代码，依赖common模块 -- client: -客户端模块，包含客户端的代码，依赖common模块 -UI 的fxml文件在 /client/src/main/resources/ui/ +## 项目概述 +Contract-Manager是一个企业级合同管理系统，提供完整的合同生命周期管理，包括合同的创建、审批、执行、归档等功能，同时集成了供应商管理、客户管理、项目管理等相关业务模块。 + +## 项目架构 + +### 模块划分 +项目采用模块化设计，分为三个主要模块： + +- **common**：公共模块，包含实体类、枚举、异常、工具类等共享组件 +- **server**：服务端模块，基于Spring Boot开发，提供HTTP服务和WebSocket通信 +- **client**：客户端模块，基于JavaFX开发，提供图形用户界面 + +### 技术栈 + +#### 服务端技术栈 +- Java 21 +- Spring Boot 3.3.7 +- Spring Data JPA 3.3.7 +- MySQL 8.0.33 +- Lombok 1.18.32 +- POI 5.2.5 (Office文档处理) +- PDFBox 3.0.1 (PDF文档处理) +- Redis (缓存) +- WebSocket (实时通信) + +#### 客户端技术栈 +- Java 21 +- JavaFX 21 +- ControlsFX 11.1.2 (UI控件增强) +- Lombok 1.18.32 +- Caffeine 3.1.8 (本地缓存) +- WebSocket (与服务端通信) + +## 目录结构 + +``` +Contract-Manager/ +├── common/ # 公共模块 +│ ├── src/main/java/com/ecep/contract/ +│ │ ├── model/ # 实体类 +│ │ ├── vo/ # 值对象 +│ │ ├── util/ # 工具类 +│ │ ├── constant/ # 常量定义 +│ │ └── msg/ # 消息相关 +├── server/ # 服务端模块 +│ ├── src/main/java/com/ecep/contract/ +│ │ ├── api/ # API接口 +│ │ ├── controller/ # 控制器 +│ │ ├── service/ # 服务层 +│ │ ├── ds/ # 数据访问层 +│ │ ├── config/ # 配置类 +│ │ ├── util/ # 工具类 +│ │ ├── handler/ # WebSocket处理器 +│ │ ├── cloud/ # 云端服务集成 +│ │ └── ui/ # 服务端UI组件 +├── client/ # 客户端模块 +│ ├── src/main/java/com/ecep/contract/ +│ │ ├── controller/ # 控制器 +│ │ ├── service/ # 服务层 +│ │ ├── vm/ # 视图模型 +│ │ ├── util/ # 工具类 +│ │ ├── task/ # 任务处理 +│ │ ├── converter/ # 类型转换器 +│ │ └── serializer/ # 序列化器 +│ └── src/main/resources/ui/ # FXML界面文件 +└── docs/ # 文档目录 + └── db/ # 数据库相关文件 +``` + +## 核心功能模块 + +### 1. 公司管理 +- 公司基本信息管理 +- 公司联系方式管理 +- 公司银行账户管理 +- 公司文件管理 +- 公司黑名单管理 + +### 2. 供应商管理 +- 供应商信息管理 +- 供应商资质审核 +- 供应商分类管理 +- 供应商文件管理 +- 供应商评估 + +### 3. 客户管理 +- 客户信息管理 +- 客户分类管理 +- 客户满意度调查 +- 客户文件管理 + +### 4. 合同管理 +- 合同创建与编辑 +- 合同审批流程 +- 合同执行跟踪 +- 合同付款计划 +- 合同文件管理 +- 合同分类与归档 + +### 5. 项目管理 +- 项目信息管理 +- 项目成本管理 +- 项目报价管理 +- 项目文件管理 +- 项目资金计划 + +### 6. 库存管理 +- 库存物品管理 +- 库存价格历史 +- 库存分类管理 + +### 7. 员工与权限管理 +- 员工信息管理 +- 角色权限管理 +- 登录历史记录 + +### 8. 云端服务集成 +- 天眼查企业信息集成 +- 用友U8系统集成 +- 其他云端服务集成 + +## 数据模型设计 + +系统采用JPA注解式实体类设计，主要实体类包括： + +- **基础实体类**：BasedEntity, IdentityEntity, NamedEntity等 +- **公司相关**：Company, CompanyContact, CompanyBankAccount等 +- **供应商相关**：Vendor, VendorApproved, VendorFile等 +- **客户相关**：CompanyCustomer, CustomerSatisfactionSurvey等 +- **合同相关**：Contract, ContractItem, ContractPayPlan等 +- **项目相关**：Project, ProjectCost, ProjectFundPlan等 +- **枚举实体类**：各种类型的本地枚举实体，如VendorTypeLocal, ContractFileTypeLocal等 + +## 通信机制 + +系统采用WebSocket进行客户端与服务端的实时通信，主要组件包括： + +- **服务端**：WebSocketController, WebSocketServerHandler +- **客户端**：WebSocketClientService, WebSocketClientSession + +## 任务处理机制 + +系统实现了异步任务处理机制，支持长时间运行的任务监控和管理： + +- **TaskMonitorCenter**：任务监控中心 +- **MonitoredTask**：可监控的任务基类 +- **TaskHistory**：任务历史记录 + +## 扩展性设计 + +系统采用良好的分层架构和接口设计，具有较强的扩展性： + +1. **服务接口标准化**：通过IEntityService等接口统一服务访问方式 +2. **模块化设计**：各功能模块相对独立，便于扩展和维护 +3. **配置管理**：支持动态配置和属性绑定 +4. **国际化支持**：通过messages.properties实现多语言支持 + +## 安全机制 + +系统实现了基本的安全机制： + +- **用户认证与授权**：基于角色的权限控制 +- **登录历史记录**：记录用户登录信息 +- **异常处理**：全局异常处理机制 + +## 部署说明 + +### 服务端部署 +1. 配置application.properties中的数据库连接和Redis连接信息 +2. 打包为jar文件：`mvn clean package` +3. 运行jar文件：`java -jar server.jar` + +### 客户端部署 +1. 确保安装Java 21运行环境 +2. 配置连接到服务端的WebSocket地址 +3. 打包为可执行jar或使用jpackage创建安装包 + +## 开发环境要求 + +- JDK 21 +- Maven 3.6+ +- MySQL 8.0+ +- Redis 6.0+ +- IntelliJ IDEA或Eclipse（推荐使用IDEA） + +## 后续优化方向 + +1. 完善单元测试和集成测试 +2. 优化数据库查询性能 +3. 增强系统安全机制 +4. 改进用户界面体验 +5. 扩展更多云端服务集成 diff --git a/client/src/main/java/com/ecep/contract/controller/HomeWindowController.java b/client/src/main/java/com/ecep/contract/controller/HomeWindowController.java index f93abd9..95d89f3 100644 --- a/client/src/main/java/com/ecep/contract/controller/HomeWindowController.java +++ b/client/src/main/java/com/ecep/contract/controller/HomeWindowController.java @@ -6,6 +6,9 @@ import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; +import com.ecep.contract.controller.cloud.rk.CloudRkManagerWindowController; +import com.ecep.contract.controller.cloud.tyc.CloudTycManagerWindowController; +import com.ecep.contract.controller.cloud.u8.YongYouU8ManagerWindowController; import org.controlsfx.control.TaskProgressView; import org.controlsfx.glyphfont.Glyph; import org.slf4j.Logger; @@ -29,7 +32,7 @@ import com.ecep.contract.controller.inventory.InventoryManagerWindowController; import com.ecep.contract.controller.permission.EmployeeFunctionsManagerWindowController; import com.ecep.contract.controller.permission.EmployeeRoleManagerWindowController; import com.ecep.contract.controller.project.ProjectManagerWindowController; -import com.ecep.contract.controller.vendor.CompanyVendorManagerWindowController; +import com.ecep.contract.controller.vendor.VendorManagerWindowController; import com.ecep.contract.service.CloudRkService; import com.ecep.contract.service.YongYouU8Service; import com.ecep.contract.task.ContractSyncTask; @@ -79,7 +82,7 @@ public class HomeWindowController extends BaseController { openCompanyManagerWindow.setOnAction(event -> showInOwner(CompanyManagerWindowController.class)); openProjectManagerWindow.setOnAction(event -> showInOwner(ProjectManagerWindowController.class)); openContractManagerWindow.setOnAction(event -> showInOwner(ContractManagerWindowController.class)); - openVendorManagerWindow.setOnAction(event -> showInOwner(CompanyVendorManagerWindowController.class)); + openVendorManagerWindow.setOnAction(event -> showInOwner(VendorManagerWindowController.class)); openCustomManagerWindow.setOnAction(event -> showInOwner(CompanyCustomerManagerWindowController.class)); } diff --git a/client/src/main/java/com/ecep/contract/controller/cloud/rk/CloudRkManagerSkin.java b/client/src/main/java/com/ecep/contract/controller/cloud/rk/CloudRkManagerSkin.java index feb938e..4d1557d 100644 --- a/client/src/main/java/com/ecep/contract/controller/cloud/rk/CloudRkManagerSkin.java +++ b/client/src/main/java/com/ecep/contract/controller/cloud/rk/CloudRkManagerSkin.java @@ -1,6 +1,7 @@ -package com.ecep.contract.controller; +package com.ecep.contract.controller.cloud.rk; import com.ecep.contract.SpringApp; +import com.ecep.contract.controller.AbstEntityManagerSkin; import com.ecep.contract.controller.company.CompanyWindowController; import com.ecep.contract.controller.table.cell.CompanyTableCell; import com.ecep.contract.controller.table.cell.LocalDateTimeTableCell; diff --git a/client/src/main/java/com/ecep/contract/controller/cloud/rk/CloudRkManagerWindowController.java b/client/src/main/java/com/ecep/contract/controller/cloud/rk/CloudRkManagerWindowController.java index 70ad1b4..26925c8 100644 --- a/client/src/main/java/com/ecep/contract/controller/cloud/rk/CloudRkManagerWindowController.java +++ b/client/src/main/java/com/ecep/contract/controller/cloud/rk/CloudRkManagerWindowController.java @@ -1,9 +1,10 @@ -package com.ecep.contract.controller; +package com.ecep.contract.controller.cloud.rk; import java.time.LocalDateTime; import java.util.concurrent.ScheduledExecutorService; import java.util.function.Consumer; +import com.ecep.contract.controller.AbstManagerWindowController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/client/src/main/java/com/ecep/contract/controller/cloud/tyc/CloudTycManagerSkin.java b/client/src/main/java/com/ecep/contract/controller/cloud/tyc/CloudTycManagerSkin.java index d0151cd..61ba2ae 100644 --- a/client/src/main/java/com/ecep/contract/controller/cloud/tyc/CloudTycManagerSkin.java +++ b/client/src/main/java/com/ecep/contract/controller/cloud/tyc/CloudTycManagerSkin.java @@ -1,6 +1,7 @@ -package com.ecep.contract.controller; +package com.ecep.contract.controller.cloud.tyc; import com.ecep.contract.SpringApp; +import com.ecep.contract.controller.AbstEntityManagerSkin; import com.ecep.contract.controller.company.CompanyWindowController; import com.ecep.contract.controller.table.cell.CompanyTableCell; import com.ecep.contract.controller.table.cell.LocalDateTimeTableCell; diff --git a/client/src/main/java/com/ecep/contract/controller/cloud/tyc/CloudTycManagerWindowController.java b/client/src/main/java/com/ecep/contract/controller/cloud/tyc/CloudTycManagerWindowController.java index 39034f3..192e542 100644 --- a/client/src/main/java/com/ecep/contract/controller/cloud/tyc/CloudTycManagerWindowController.java +++ b/client/src/main/java/com/ecep/contract/controller/cloud/tyc/CloudTycManagerWindowController.java @@ -1,7 +1,8 @@ -package com.ecep.contract.controller; +package com.ecep.contract.controller.cloud.tyc; import java.time.LocalDateTime; +import com.ecep.contract.controller.AbstManagerWindowController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Scope; diff --git a/client/src/main/java/com/ecep/contract/controller/cloud/u8/YongYouU8ConfigWindowController.java b/client/src/main/java/com/ecep/contract/controller/cloud/u8/YongYouU8ConfigWindowController.java index 6524b07..122b267 100644 --- a/client/src/main/java/com/ecep/contract/controller/cloud/u8/YongYouU8ConfigWindowController.java +++ b/client/src/main/java/com/ecep/contract/controller/cloud/u8/YongYouU8ConfigWindowController.java @@ -1,5 +1,6 @@ -package com.ecep.contract.controller; +package com.ecep.contract.controller.cloud.u8; +import com.ecep.contract.controller.BaseController; import org.controlsfx.control.ToggleSwitch; import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Scope; diff --git a/client/src/main/java/com/ecep/contract/controller/cloud/u8/YongYouU8ManagerSkin.java b/client/src/main/java/com/ecep/contract/controller/cloud/u8/YongYouU8ManagerSkin.java index 18b111e..e117dc1 100644 --- a/client/src/main/java/com/ecep/contract/controller/cloud/u8/YongYouU8ManagerSkin.java +++ b/client/src/main/java/com/ecep/contract/controller/cloud/u8/YongYouU8ManagerSkin.java @@ -1,12 +1,12 @@ -package com.ecep.contract.controller; +package com.ecep.contract.controller.cloud.u8; +import com.ecep.contract.controller.AbstEntityManagerSkin; +import com.ecep.contract.controller.ManagerSkin; import com.ecep.contract.controller.company.CompanyWindowController; import com.ecep.contract.controller.table.cell.CompanyTableCell; import com.ecep.contract.controller.table.cell.LocalDateTimeTableCell; -import com.ecep.contract.model.Company; import com.ecep.contract.service.CompanyService; import com.ecep.contract.service.YongYouU8Service; -import com.ecep.contract.util.ProxyUtils; import com.ecep.contract.vm.CloudYuInfoViewModel; import com.ecep.contract.vo.CloudYuVo; import com.ecep.contract.vo.CompanyVo; diff --git a/client/src/main/java/com/ecep/contract/controller/cloud/u8/YongYouU8ManagerWindowController.java b/client/src/main/java/com/ecep/contract/controller/cloud/u8/YongYouU8ManagerWindowController.java index 1473eaa..6c699dd 100644 --- a/client/src/main/java/com/ecep/contract/controller/cloud/u8/YongYouU8ManagerWindowController.java +++ b/client/src/main/java/com/ecep/contract/controller/cloud/u8/YongYouU8ManagerWindowController.java @@ -1,7 +1,10 @@ -package com.ecep.contract.controller; +package com.ecep.contract.controller.cloud.u8; import java.time.LocalDateTime; +import com.ecep.contract.controller.AbstManagerWindowController; +import com.ecep.contract.controller.BaseController; +import com.ecep.contract.task.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Lazy; @@ -10,10 +13,6 @@ import org.springframework.stereotype.Component; import com.ecep.contract.Desktop; import com.ecep.contract.service.YongYouU8Service; -import com.ecep.contract.task.ContractSyncTask; -import com.ecep.contract.task.CustomerSyncTask; -import com.ecep.contract.task.EmployeesSyncTask; -import com.ecep.contract.task.VendorSyncTask; import com.ecep.contract.util.FxmlPath; import com.ecep.contract.util.UITools; import com.ecep.contract.vm.CloudYuInfoViewModel; diff --git a/client/src/main/java/com/ecep/contract/controller/company/CompanyWindowController.java b/client/src/main/java/com/ecep/contract/controller/company/CompanyWindowController.java index 73ca9f7..cb60ed9 100644 --- a/client/src/main/java/com/ecep/contract/controller/company/CompanyWindowController.java +++ b/client/src/main/java/com/ecep/contract/controller/company/CompanyWindowController.java @@ -25,17 +25,17 @@ import com.ecep.contract.controller.tab.CompanyTabSkinInvoice; import com.ecep.contract.controller.tab.CompanyTabSkinOldName; import com.ecep.contract.controller.tab.CompanyTabSkinOther; import com.ecep.contract.controller.tab.CompanyTabSkinPurchaseBillVoucher; -import com.ecep.contract.controller.vendor.CompanyVendorWindowController; +import com.ecep.contract.controller.vendor.VendorWindowController; import com.ecep.contract.service.CompanyCustomerService; import com.ecep.contract.service.CompanyService; -import com.ecep.contract.service.CompanyVendorService; +import com.ecep.contract.service.VendorService; import com.ecep.contract.task.CompanyCompositeUpdateTasker; import com.ecep.contract.task.CompanyVerifyTasker; import com.ecep.contract.util.FxmlPath; import com.ecep.contract.util.UITools; import com.ecep.contract.vm.CompanyViewModel; import com.ecep.contract.vo.CompanyCustomerVo; -import com.ecep.contract.vo.CompanyVendorVo; +import com.ecep.contract.vo.VendorVo; import com.ecep.contract.vo.CompanyVo; import javafx.beans.property.SimpleObjectProperty; @@ -78,7 +78,7 @@ public class CompanyWindowController @Autowired private CompanyCustomerService companyCustomerService; @Autowired - private CompanyVendorService companyVendorService; + private VendorService vendorService; public BorderPane root; public TabPane tabPane; @@ -129,7 +129,7 @@ public class CompanyWindowController // CompanyVendorViewModel(); private final SimpleObjectProperty companyCustomerProperty = new SimpleObjectProperty<>(); - private final SimpleObjectProperty companyVendorProperty = new SimpleObjectProperty<>(); + private final SimpleObjectProperty companyVendorProperty = new SimpleObjectProperty<>(); public Pane customerTab_pane1; public Button customerTab_openBtn; @@ -230,7 +230,7 @@ public class CompanyWindowController }); vendorTab_openBtn.setOnAction(event -> { - CompanyVendorWindowController.show(companyVendorProperty.get(), root.getScene().getWindow()); + VendorWindowController.show(companyVendorProperty.get(), root.getScene().getWindow()); }); } @@ -242,7 +242,7 @@ public class CompanyWindowController if (logger.isDebugEnabled()) { logger.debug("onVendorTabShown company {}", company.getName()); } - companyVendorProperty.set(companyVendorService.findByCompany(company)); + companyVendorProperty.set(vendorService.findByCompany(company)); }).exceptionally(ex -> { UITools.showExceptionAndWait(ex.getMessage(), ex); return null; diff --git a/client/src/main/java/com/ecep/contract/controller/company/bank_account/BankAccountBaseTabSkin.java b/client/src/main/java/com/ecep/contract/controller/company/bank_account/BankAccountBaseTabSkin.java index b3dffef..bdc812c 100644 --- a/client/src/main/java/com/ecep/contract/controller/company/bank_account/BankAccountBaseTabSkin.java +++ b/client/src/main/java/com/ecep/contract/controller/company/bank_account/BankAccountBaseTabSkin.java @@ -1,4 +1,4 @@ -package com.ecep.contract.controller.bank.account; +package com.ecep.contract.controller.company.bank_account; import com.ecep.contract.controller.company.CompanyWindowController; import com.ecep.contract.controller.tab.AbstEntityBasedTabSkin; diff --git a/client/src/main/java/com/ecep/contract/controller/company/bank_account/BankAccountWindowController.java b/client/src/main/java/com/ecep/contract/controller/company/bank_account/BankAccountWindowController.java index 7926f49..f4c0375 100644 --- a/client/src/main/java/com/ecep/contract/controller/company/bank_account/BankAccountWindowController.java +++ b/client/src/main/java/com/ecep/contract/controller/company/bank_account/BankAccountWindowController.java @@ -1,4 +1,4 @@ -package com.ecep.contract.controller.bank.account; +package com.ecep.contract.controller.company.bank_account; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; @@ -6,7 +6,6 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import com.ecep.contract.controller.AbstEntityController; -import com.ecep.contract.model.CompanyBankAccount; import com.ecep.contract.service.CompanyBankAccountService; import com.ecep.contract.util.FxmlPath; import com.ecep.contract.vm.CompanyBankAccountViewModel; 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 index 66baa02..4a2ab3e 100644 --- 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 @@ -1,4 +1,4 @@ -package com.ecep.contract.controller.company_old_name; +package com.ecep.contract.controller.company.old_name; import java.time.format.DateTimeFormatter; 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 index 9b8a20e..e32a314 100644 --- 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 @@ -1,9 +1,7 @@ -package com.ecep.contract.controller.company_old_name; +package com.ecep.contract.controller.company.old_name; import java.io.File; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.function.Consumer; import org.springframework.util.StringUtils; @@ -12,7 +10,6 @@ import com.ecep.contract.CompanyFileType; import com.ecep.contract.DesktopUtils; import com.ecep.contract.controller.tab.TabSkin; import com.ecep.contract.controller.table.AbstEntityTableTabSkin; -import com.ecep.contract.model.CompanyOldName; import com.ecep.contract.service.CompanyFileService; import com.ecep.contract.service.CompanyOldNameService; import com.ecep.contract.util.ParamUtils; 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 index 0bf9731..cda22f9 100644 --- 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 @@ -1,4 +1,4 @@ -package com.ecep.contract.controller.company_old_name; +package com.ecep.contract.controller.company.old_name; import java.io.File; import java.util.concurrent.CompletableFuture; diff --git a/client/src/main/java/com/ecep/contract/controller/contract/ContractTabSkinExtendVendorInfo.java b/client/src/main/java/com/ecep/contract/controller/contract/ContractTabSkinExtendVendorInfo.java index 673ffa6..ba2c32e 100644 --- a/client/src/main/java/com/ecep/contract/controller/contract/ContractTabSkinExtendVendorInfo.java +++ b/client/src/main/java/com/ecep/contract/controller/contract/ContractTabSkinExtendVendorInfo.java @@ -1,11 +1,8 @@ package com.ecep.contract.controller.contract; -import java.util.List; import java.util.concurrent.CompletableFuture; -import com.ecep.contract.SpringApp; -import com.ecep.contract.controller.ComboBoxUtils; -import com.ecep.contract.model.VendorGroup; +import com.ecep.contract.util.ComboBoxUtils; import com.ecep.contract.service.ExtendVendorInfoService; import com.ecep.contract.service.VendorGroupService; import com.ecep.contract.util.FxmlPath; @@ -25,7 +22,6 @@ import javafx.scene.control.Label; import javafx.scene.control.Tab; import javafx.scene.control.TextField; import javafx.util.converter.NumberStringConverter; -import lombok.Setter; @FxmlPath("/ui/contract/contract-tab-ext-vendor-info.fxml") public class ContractTabSkinExtendVendorInfo extends AbstContractBasedTabSkin { diff --git a/client/src/main/java/com/ecep/contract/controller/project/ProjectManagerSkin.java b/client/src/main/java/com/ecep/contract/controller/project/ProjectManagerSkin.java index 9447a36..5c0ae53 100644 --- a/client/src/main/java/com/ecep/contract/controller/project/ProjectManagerSkin.java +++ b/client/src/main/java/com/ecep/contract/controller/project/ProjectManagerSkin.java @@ -2,7 +2,7 @@ package com.ecep.contract.controller.project; import com.ecep.contract.controller.AbstEntityManagerSkin; import com.ecep.contract.controller.BaseController; -import com.ecep.contract.controller.ComboBoxUtils; +import com.ecep.contract.util.ComboBoxUtils; import com.ecep.contract.controller.ManagerSkin; import com.ecep.contract.controller.table.cell.CompanyTableCell; import com.ecep.contract.controller.table.cell.ProductTypeTableCell; diff --git a/client/src/main/java/com/ecep/contract/controller/project/ProjectTabSkinBase.java b/client/src/main/java/com/ecep/contract/controller/project/ProjectTabSkinBase.java index f7ccd9b..2f6b152 100644 --- a/client/src/main/java/com/ecep/contract/controller/project/ProjectTabSkinBase.java +++ b/client/src/main/java/com/ecep/contract/controller/project/ProjectTabSkinBase.java @@ -6,10 +6,9 @@ import java.util.stream.Stream; import org.springframework.util.StringUtils; -import com.ecep.contract.controller.ComboBoxUtils; +import com.ecep.contract.util.ComboBoxUtils; import com.ecep.contract.controller.tab.TabSkin; import com.ecep.contract.converter.EmployeeStringConverter; -import com.ecep.contract.converter.EntityStringConverter; import com.ecep.contract.service.DeliverySignMethodService; import com.ecep.contract.service.EmployeeService; import com.ecep.contract.service.ProductTypeService; @@ -29,11 +28,9 @@ import com.ecep.contract.vo.ProjectTypeVo; import com.ecep.contract.vo.ProjectVo; import javafx.beans.binding.Bindings; -import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.collections.transformation.FilteredList; import javafx.event.ActionEvent; -import javafx.scene.control.ComboBox; import javafx.scene.control.Tab; import javafx.util.converter.LocalDateStringConverter; import javafx.util.converter.NumberStringConverter; diff --git a/client/src/main/java/com/ecep/contract/controller/tab/CompanyTabSkinBankAccount.java b/client/src/main/java/com/ecep/contract/controller/tab/CompanyTabSkinBankAccount.java index 0d110fb..871e5f5 100644 --- a/client/src/main/java/com/ecep/contract/controller/tab/CompanyTabSkinBankAccount.java +++ b/client/src/main/java/com/ecep/contract/controller/tab/CompanyTabSkinBankAccount.java @@ -1,11 +1,10 @@ package com.ecep.contract.controller.tab; -import com.ecep.contract.controller.bank.account.BankAccountWindowController; +import com.ecep.contract.controller.company.bank_account.BankAccountWindowController; import com.ecep.contract.controller.company.AbstCompanyTableTabSkin; import com.ecep.contract.controller.company.CompanyWindowController; import com.ecep.contract.controller.table.EditableEntityTableTabSkin; import com.ecep.contract.controller.table.cell.BankTableCell; -import com.ecep.contract.model.Bank; import com.ecep.contract.service.BankService; import com.ecep.contract.service.CompanyBankAccountService; import com.ecep.contract.util.FxmlPath; diff --git a/client/src/main/java/com/ecep/contract/controller/tab/CompanyTabSkinContract.java b/client/src/main/java/com/ecep/contract/controller/tab/CompanyTabSkinContract.java index 3046132..308ab99 100644 --- a/client/src/main/java/com/ecep/contract/controller/tab/CompanyTabSkinContract.java +++ b/client/src/main/java/com/ecep/contract/controller/tab/CompanyTabSkinContract.java @@ -6,7 +6,7 @@ import java.time.LocalDateTime; import java.util.NoSuchElementException; import java.util.concurrent.CompletableFuture; -import com.ecep.contract.controller.ComboBoxUtils; +import com.ecep.contract.util.ComboBoxUtils; import org.springframework.util.StringUtils; import com.ecep.contract.DesktopUtils; @@ -19,12 +19,6 @@ import com.ecep.contract.controller.table.cell.ContractKindTableCell; import com.ecep.contract.controller.table.cell.ContractTypeTableCell; import com.ecep.contract.controller.table.cell.EmployeeTableCell; import com.ecep.contract.controller.table.cell.LocalDateTimeTableCell; -import com.ecep.contract.converter.ContractGroupStringConverter; -import com.ecep.contract.model.Contract; -import com.ecep.contract.model.ContractGroup; -import com.ecep.contract.model.ContractKind; -import com.ecep.contract.model.ContractType; -import com.ecep.contract.model.Employee; import com.ecep.contract.service.ContractGroupService; import com.ecep.contract.service.ContractKindService; import com.ecep.contract.service.ContractService; @@ -38,8 +32,6 @@ import com.ecep.contract.vo.CompanyVo; import com.ecep.contract.vo.ContractGroupVo; import com.ecep.contract.vo.ContractVo; -import javafx.collections.FXCollections; -import javafx.collections.ObservableList; import javafx.event.ActionEvent; import javafx.scene.control.Button; import javafx.scene.control.ComboBox; diff --git a/client/src/main/java/com/ecep/contract/controller/tab/CompanyTabSkinOldName.java b/client/src/main/java/com/ecep/contract/controller/tab/CompanyTabSkinOldName.java index 9846c0c..cc629be 100644 --- a/client/src/main/java/com/ecep/contract/controller/tab/CompanyTabSkinOldName.java +++ b/client/src/main/java/com/ecep/contract/controller/tab/CompanyTabSkinOldName.java @@ -14,9 +14,7 @@ import org.springframework.util.StringUtils; import com.ecep.contract.controller.company.AbstCompanyTableTabSkin; import com.ecep.contract.controller.company.CompanyWindowController; -import com.ecep.contract.controller.company_old_name.CompanyOldNameWindowController; -import com.ecep.contract.model.Company; -import com.ecep.contract.model.CompanyOldName; +import com.ecep.contract.controller.company.old_name.CompanyOldNameWindowController; import com.ecep.contract.service.CompanyOldNameService; import com.ecep.contract.util.FxmlPath; import com.ecep.contract.vm.CompanyOldNameViewModel; diff --git a/client/src/main/java/com/ecep/contract/controller/tab/ContractManagerSkin.java b/client/src/main/java/com/ecep/contract/controller/tab/ContractManagerSkin.java index 4874294..942d09b 100644 --- a/client/src/main/java/com/ecep/contract/controller/tab/ContractManagerSkin.java +++ b/client/src/main/java/com/ecep/contract/controller/tab/ContractManagerSkin.java @@ -5,7 +5,7 @@ import java.time.format.DateTimeFormatter; import com.ecep.contract.ContractPayWay; import com.ecep.contract.MyDateTimeUtils; import com.ecep.contract.controller.AbstEntityManagerSkin; -import com.ecep.contract.controller.ComboBoxUtils; +import com.ecep.contract.util.ComboBoxUtils; import com.ecep.contract.controller.ManagerSkin; import com.ecep.contract.controller.contract.ContractManagerWindowController; import com.ecep.contract.controller.contract.ContractWindowController; diff --git a/client/src/main/java/com/ecep/contract/controller/tab/ContractTabSkinBase.java b/client/src/main/java/com/ecep/contract/controller/tab/ContractTabSkinBase.java index ecf6155..73e996d 100644 --- a/client/src/main/java/com/ecep/contract/controller/tab/ContractTabSkinBase.java +++ b/client/src/main/java/com/ecep/contract/controller/tab/ContractTabSkinBase.java @@ -8,6 +8,7 @@ import java.util.NoSuchElementException; import java.util.Objects; import java.util.Optional; +import com.ecep.contract.service.*; import org.controlsfx.control.textfield.TextFields; import org.controlsfx.glyphfont.Glyph; import org.springframework.util.StringUtils; @@ -18,24 +19,12 @@ import com.ecep.contract.controller.contract.AbstContractBasedTabSkin; import com.ecep.contract.controller.contract.ContractWindowController; import com.ecep.contract.controller.customer.CompanyCustomerWindowController; import com.ecep.contract.controller.project.ProjectWindowController; -import com.ecep.contract.controller.vendor.CompanyVendorWindowController; -import com.ecep.contract.converter.CompanyStringConverter; +import com.ecep.contract.controller.vendor.VendorWindowController; import com.ecep.contract.converter.ContractStringConverter; -import com.ecep.contract.converter.ProjectStringConverter; -import com.ecep.contract.model.Project; -import com.ecep.contract.service.CompanyCustomerService; -import com.ecep.contract.service.CompanyVendorService; -import com.ecep.contract.service.ContractGroupService; -import com.ecep.contract.service.ContractKindService; -import com.ecep.contract.service.ContractService; -import com.ecep.contract.service.ContractTypeService; -import com.ecep.contract.service.ExtendVendorInfoService; -import com.ecep.contract.service.ProjectSaleTypeService; -import com.ecep.contract.service.ProjectService; -import com.ecep.contract.service.VendorGroupService; +import com.ecep.contract.service.VendorService; import com.ecep.contract.util.UITools; import com.ecep.contract.vo.CompanyCustomerVo; -import com.ecep.contract.vo.CompanyVendorVo; +import com.ecep.contract.vo.VendorVo; import com.ecep.contract.vo.CompanyVo; import com.ecep.contract.vo.ContractTypeVo; import com.ecep.contract.vo.ContractVo; @@ -49,7 +38,6 @@ import javafx.scene.control.Tab; import javafx.scene.control.TextField; import javafx.scene.control.TextInputDialog; import javafx.stage.DirectoryChooser; -import javafx.util.StringConverter; import javafx.util.converter.LocalDateStringConverter; import javafx.util.converter.NumberStringConverter; @@ -464,9 +452,9 @@ public class ContractTabSkinBase extends AbstContractBasedTabSkin { public void onContractOpenRelativeCompanyVendorAction(ActionEvent event) { ContractVo contract = getEntity(); CompanyVo company = controller.getCompanyService().findById(contract.getCompanyId()); - CompanyVendorService service = SpringApp.getBean(CompanyVendorService.class); - CompanyVendorVo companyVendor = service.findByCompany(company); - CompanyVendorWindowController.show(companyVendor, null); + VendorService service = SpringApp.getBean(VendorService.class); + VendorVo companyVendor = service.findByCompany(company); + VendorWindowController.show(companyVendor, null); } private void initializeBaseTabCompanyFieldAutoCompletion(TextField textField) { diff --git a/client/src/main/java/com/ecep/contract/controller/tab/ContractTabSkinPurchaseOrders.java b/client/src/main/java/com/ecep/contract/controller/tab/ContractTabSkinPurchaseOrders.java index 601a1a0..e21baa7 100644 --- a/client/src/main/java/com/ecep/contract/controller/tab/ContractTabSkinPurchaseOrders.java +++ b/client/src/main/java/com/ecep/contract/controller/tab/ContractTabSkinPurchaseOrders.java @@ -6,13 +6,12 @@ import com.ecep.contract.ContractPayWay; import com.ecep.contract.util.FxmlPath; import com.ecep.contract.controller.contract.AbstContractTableTabSkin; import com.ecep.contract.controller.contract.ContractWindowController; -import com.ecep.contract.controller.vendor.PurchaseOrderWindowController; +import com.ecep.contract.controller.vendor.purchase.order.PurchaseOrderWindowController; import com.ecep.contract.converter.EmployeeStringConverter; import com.ecep.contract.service.CompanyService; import com.ecep.contract.service.PurchaseOrdersService; import com.ecep.contract.vm.PurchaseOrderViewModel; import com.ecep.contract.vo.PurchaseOrderVo; -import com.ecep.contract.model.PurchaseOrder; import com.ecep.contract.controller.table.cell.CompanyTableCell; import com.ecep.contract.controller.table.cell.LocalDateTimeTableCell; diff --git a/client/src/main/java/com/ecep/contract/controller/tab/ContractTabSkinVendorBid.java b/client/src/main/java/com/ecep/contract/controller/tab/ContractTabSkinVendorBid.java index ecf24cc..641a9a4 100644 --- a/client/src/main/java/com/ecep/contract/controller/tab/ContractTabSkinVendorBid.java +++ b/client/src/main/java/com/ecep/contract/controller/tab/ContractTabSkinVendorBid.java @@ -11,14 +11,10 @@ import com.ecep.contract.controller.contract.ContractWindowController; import com.ecep.contract.controller.table.EditableEntityTableTabSkin; import com.ecep.contract.controller.table.cell.CompanyTableCell; import com.ecep.contract.controller.table.cell.ContractFileTableCell; -import com.ecep.contract.controller.vendor.VendorBidWindowController; -import com.ecep.contract.model.ContractBidVendor; -import com.ecep.contract.model.ContractFile; +import com.ecep.contract.controller.vendor.bid.VendorBidWindowController; import com.ecep.contract.service.CompanyService; import com.ecep.contract.service.ContractBidVendorService; -import com.ecep.contract.service.ContractFileService; import com.ecep.contract.util.FxmlPath; -import com.ecep.contract.util.ProxyUtils; import com.ecep.contract.vm.CompanyViewModel; import com.ecep.contract.vm.ContractBidVendorViewModel; import com.ecep.contract.vo.CompanyVo; @@ -32,7 +28,6 @@ import javafx.scene.control.ChoiceDialog; import javafx.scene.control.ComboBox; import javafx.scene.control.MenuItem; import javafx.scene.control.Tab; -import javafx.scene.control.TableCell; import javafx.scene.control.TableColumn; import javafx.util.StringConverter; import lombok.Setter; diff --git a/client/src/main/java/com/ecep/contract/controller/tab/ContractUpdater.java b/client/src/main/java/com/ecep/contract/controller/tab/ContractUpdater.java index de04ff8..aacf4eb 100644 --- a/client/src/main/java/com/ecep/contract/controller/tab/ContractUpdater.java +++ b/client/src/main/java/com/ecep/contract/controller/tab/ContractUpdater.java @@ -3,18 +3,11 @@ package com.ecep.contract.controller.tab; import java.util.Map; import java.util.logging.Level; +import com.ecep.contract.service.*; import org.springframework.beans.BeansException; import com.ecep.contract.MessageHolder; -import com.ecep.contract.service.CompanyCustomerService; -import com.ecep.contract.service.CompanyService; -import com.ecep.contract.service.CompanyVendorService; -import com.ecep.contract.service.ContractGroupService; -import com.ecep.contract.service.ContractKindService; -import com.ecep.contract.service.ContractService; -import com.ecep.contract.service.ContractTypeService; -import com.ecep.contract.service.EmployeeService; -import com.ecep.contract.service.YongYouU8Service; +import com.ecep.contract.service.VendorService; import com.ecep.contract.util.BeanCacher; import com.ecep.contract.vo.ContractGroupVo; import com.ecep.contract.vo.ContractKindVo; @@ -153,8 +146,8 @@ public class ContractUpdater implements MessageHolder { return getEmployeeService().findByName(personName); } - private CompanyVendorService getVendorService() { - return getBean(CompanyVendorService.class); + private VendorService getVendorService() { + return getBean(VendorService.class); } private CompanyCustomerService getCustomerService() { diff --git a/client/src/main/java/com/ecep/contract/controller/tab/VendorBidTabSkinBase.java b/client/src/main/java/com/ecep/contract/controller/tab/VendorBidTabSkinBase.java index af7e9f5..6f9c3c4 100644 --- a/client/src/main/java/com/ecep/contract/controller/tab/VendorBidTabSkinBase.java +++ b/client/src/main/java/com/ecep/contract/controller/tab/VendorBidTabSkinBase.java @@ -8,10 +8,8 @@ import java.util.Map; import org.springframework.data.domain.Pageable; import com.ecep.contract.MyDateTimeUtils; -import com.ecep.contract.SpringApp; import com.ecep.contract.controller.company.CompanyWindowController; -import com.ecep.contract.controller.vendor.VendorBidWindowController; -import com.ecep.contract.converter.CompanyStringConverter; +import com.ecep.contract.controller.vendor.bid.VendorBidWindowController; import com.ecep.contract.converter.EntityStringConverter; import com.ecep.contract.service.CompanyService; import com.ecep.contract.service.ContractFileService; @@ -33,7 +31,6 @@ import javafx.beans.property.SimpleObjectProperty; import javafx.scene.control.Tab; import javafx.scene.control.TextField; import javafx.util.converter.LocalDateStringConverter; -import lombok.Setter; public class VendorBidTabSkinBase extends AbstEntityBasedTabSkin diff --git a/client/src/main/java/com/ecep/contract/controller/table/cell/CompanyVendorTableCell.java b/client/src/main/java/com/ecep/contract/controller/table/cell/CompanyVendorTableCell.java index 70d2c12..ce5939e 100644 --- a/client/src/main/java/com/ecep/contract/controller/table/cell/CompanyVendorTableCell.java +++ b/client/src/main/java/com/ecep/contract/controller/table/cell/CompanyVendorTableCell.java @@ -2,9 +2,9 @@ package com.ecep.contract.controller.table.cell; import com.ecep.contract.SpringApp; import com.ecep.contract.service.CompanyService; -import com.ecep.contract.service.CompanyVendorService; +import com.ecep.contract.service.VendorService; import com.ecep.contract.service.IEntityService; -import com.ecep.contract.vo.CompanyVendorVo; +import com.ecep.contract.vo.VendorVo; import com.ecep.contract.vo.CompanyVo; import javafx.scene.control.TableCell; @@ -14,13 +14,13 @@ import lombok.NoArgsConstructor; import lombok.Setter; @NoArgsConstructor -public class CompanyVendorTableCell extends AsyncUpdateTableCell { +public class CompanyVendorTableCell extends AsyncUpdateTableCell { public static Callback, TableCell> forTableColumn() { - return forTableColumn(SpringApp.getBean(CompanyVendorService.class)); + return forTableColumn(SpringApp.getBean(VendorService.class)); } public static Callback, TableCell> forTableColumn( - CompanyVendorService sevice) { + VendorService sevice) { CompanyService companyService = SpringApp.getBean(CompanyService.class); return param -> new CompanyVendorTableCell(sevice, companyService); } @@ -28,14 +28,14 @@ public class CompanyVendorTableCell extends AsyncUpdateTableCell getServiceBean() { - return SpringApp.getBean(CompanyVendorService.class); + protected IEntityService getServiceBean() { + return SpringApp.getBean(VendorService.class); } protected CompanyService getCompanyService() { @@ -46,7 +46,7 @@ public class CompanyVendorTableCell extends AsyncUpdateTableCell extends AsyncUpdateTableCell> - extends AbstEntityTableTabSkin +public abstract class AbstVendorTableTabSkin> + extends AbstEntityTableTabSkin implements TabSkin { - public AbstCompanyVendorTableTabSkin(CompanyVendorWindowController controller) { + public AbstVendorTableTabSkin(VendorWindowController controller) { super(controller); } diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/VendorManagerSkin.java b/client/src/main/java/com/ecep/contract/controller/vendor/VendorManagerSkin.java index 809191a..7b6dea7 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/VendorManagerSkin.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/VendorManagerSkin.java @@ -2,7 +2,7 @@ package com.ecep.contract.controller.vendor; import com.ecep.contract.MyDateTimeUtils; import com.ecep.contract.controller.AbstEntityManagerSkin; -import com.ecep.contract.controller.ComboBoxUtils; +import com.ecep.contract.util.ComboBoxUtils; import com.ecep.contract.controller.table.cell.CompanyTableCell; import com.ecep.contract.controller.table.cell.VendorCatalogTableCell; import com.ecep.contract.controller.table.cell.VendorTypeTableCell; @@ -16,13 +16,13 @@ import com.ecep.contract.vo.VendorVo; import javafx.application.Platform; import lombok.Setter; -public class CompanyVendorManagerSkin +public class VendorManagerSkin extends - AbstEntityManagerSkin { + AbstEntityManagerSkin { @Setter private CompanyService companyService; - public CompanyVendorManagerSkin(VendorManagerWindowController controller) { + public VendorManagerSkin(VendorManagerWindowController controller) { super(controller); } @@ -81,6 +81,6 @@ public class CompanyVendorManagerSkin } private void showInOwner(CompanyVendorViewModel model) { - showInOwner(CompanyVendorWindowController.class, model); + showInOwner(VendorWindowController.class, model); } } \ No newline at end of file diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/VendorManagerWindowController.java b/client/src/main/java/com/ecep/contract/controller/vendor/VendorManagerWindowController.java index 9704636..6738a0d 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/VendorManagerWindowController.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/VendorManagerWindowController.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; import com.ecep.contract.MessageHolder; import com.ecep.contract.VendorType; import com.ecep.contract.controller.AbstManagerWindowController; -import com.ecep.contract.controller.vendor.approved_list.CompanyVendorApprovedListManagerWindowController; +import com.ecep.contract.controller.vendor.approved_list.VendorApprovedListManagerWindowController; import com.ecep.contract.controller.vendor.group.VendorGroupManagerWindowController; import com.ecep.contract.service.CompanyService; import com.ecep.contract.task.VendorVerifyAllTasker; @@ -34,8 +34,8 @@ import javafx.stage.Stage; @Scope("prototype") @Component @FxmlPath("/ui/company/vendor/vendor_manager.fxml") -public class CompanyVendorManagerWindowController - extends AbstManagerWindowController { +public class VendorManagerWindowController + extends AbstManagerWindowController { // columns public TableColumn idColumn; @@ -100,7 +100,7 @@ public class CompanyVendorManagerWindowController } public void onOpenApprovedVendorListWindowAction(ActionEvent event) { - show(CompanyVendorApprovedListManagerWindowController.class, null); + show(VendorApprovedListManagerWindowController.class, null); } public void onBaseTableRefreshAction(ActionEvent event) { @@ -112,8 +112,8 @@ public class CompanyVendorManagerWindowController } @Override - protected CompanyVendorManagerSkin createDefaultSkin() { - CompanyVendorManagerSkin skin = new CompanyVendorManagerSkin(this); + protected VendorManagerSkin createDefaultSkin() { + VendorManagerSkin skin = new VendorManagerSkin(this); skin.setCompanyService(companyService); return skin; } diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/VendorTabSkinBase.java b/client/src/main/java/com/ecep/contract/controller/vendor/VendorTabSkinBase.java index 78a599a..74aa19d 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/VendorTabSkinBase.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/VendorTabSkinBase.java @@ -5,7 +5,7 @@ import java.time.format.DateTimeFormatter; import com.ecep.contract.MyDateTimeUtils; import com.ecep.contract.SpringApp; import com.ecep.contract.VendorType; -import com.ecep.contract.controller.ComboBoxUtils; +import com.ecep.contract.util.ComboBoxUtils; import com.ecep.contract.controller.company.CompanyWindowController; import com.ecep.contract.controller.tab.AbstEntityBasedTabSkin; import com.ecep.contract.service.CompanyContactService; @@ -26,9 +26,9 @@ import javafx.scene.control.Tab; import javafx.util.converter.LocalDateStringConverter; import javafx.util.converter.LocalDateTimeStringConverter; -public class CompanyVendorTabSkinBase - extends AbstEntityBasedTabSkin { - public CompanyVendorTabSkinBase(CompanyVendorWindowController controller) { +public class VendorTabSkinBase + extends AbstEntityBasedTabSkin { + public VendorTabSkinBase(VendorWindowController controller) { super(controller); } diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/VendorTabSkinEntity.java b/client/src/main/java/com/ecep/contract/controller/vendor/VendorTabSkinEntity.java index bc7ab68..b22ba0b 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/VendorTabSkinEntity.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/VendorTabSkinEntity.java @@ -16,8 +16,8 @@ import javafx.scene.control.Tab; import javafx.scene.control.TableColumn; @FxmlPath("/ui/company/vendor/vendor-tab-entity.fxml") -public class CompanyVendorTabSkinEntity - extends AbstCompanyVendorTableTabSkin +public class VendorTabSkinEntity + extends AbstVendorTableTabSkin implements TabSkin { // 关联项 tab @@ -35,7 +35,7 @@ public class CompanyVendorTabSkinEntity public MenuItem entityTable_menu_refresh; public MenuItem entityTable_menu_del; - public CompanyVendorTabSkinEntity(CompanyVendorWindowController controller) { + public VendorTabSkinEntity(VendorWindowController controller) { super(controller); } diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/VendorTabSkinFile.java b/client/src/main/java/com/ecep/contract/controller/vendor/VendorTabSkinFile.java index f9b1b3a..d8221c9 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/VendorTabSkinFile.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/VendorTabSkinFile.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.concurrent.CompletableFuture; import com.ecep.contract.service.VendorFileTypeService; -import com.ecep.contract.vo.CompanyVendorFileVo; -import com.ecep.contract.vo.CompanyVendorVo; +import com.ecep.contract.vo.VendorFileVo; +import com.ecep.contract.vo.VendorVo; import com.ecep.contract.vo.CompanyVo; import com.ecep.contract.vo.VendorFileTypeLocalVo; import org.springframework.util.StringUtils; @@ -19,7 +19,7 @@ import com.ecep.contract.SpringApp; import com.ecep.contract.constant.CompanyVendorConstant; import com.ecep.contract.controller.tab.TabSkin; import com.ecep.contract.model.BaseEnumEntity; -import com.ecep.contract.service.CompanyVendorFileService; +import com.ecep.contract.service.VendorFileService; import com.ecep.contract.task.CompanyVendorEvaluationFormUpdateTask; import com.ecep.contract.util.FxmlPath; import com.ecep.contract.util.UITools; @@ -45,7 +45,7 @@ import lombok.Setter; */ @FxmlPath("/ui/company/vendor/vendor-tab-file.fxml") public class VendorTabSkinFile - extends AbstCompanyVendorTableTabSkin + extends AbstVendorTableTabSkin implements TabSkin { public TableColumn fileTable_idColumn; @@ -65,9 +65,9 @@ public class VendorTabSkinFile public Button fileTable_calcNextSignDateBtn; @Setter - private CompanyVendorFileService companyVendorFileService; + private VendorFileService vendorFileService; - public VendorTabSkinFile(CompanyVendorWindowController controller) { + public VendorTabSkinFile(VendorWindowController controller) { super(controller); setDragAndDrop(true); setDragAndDropFileHandler(this::moveFileToCustomer); @@ -79,8 +79,8 @@ public class VendorTabSkinFile } @Override - protected CompanyVendorFileService getViewModelService() { - return getCompanyVendorFileService(); + protected VendorFileService getViewModelService() { + return getVendorFileService(); } @Override @@ -127,7 +127,7 @@ public class VendorTabSkinFile } private void moveFileToCustomer(List files) { - CompanyVendorVo companyVendor = getParent(); + VendorVo companyVendor = getParent(); String path = companyVendor.getPath(); if (!StringUtils.hasText(path)) { setStatus("未设置目录"); @@ -139,7 +139,7 @@ public class VendorTabSkinFile return; } - LocalDate nextSignDate = getCompanyVendorFileService().getNextSignDate(companyVendor, this::setStatus); + LocalDate nextSignDate = getVendorFileService().getNextSignDate(companyVendor, this::setStatus); if (nextSignDate != null && files.size() == 1) { File file = files.getFirst(); String fileName = file.getName(); @@ -149,13 +149,13 @@ public class VendorTabSkinFile + "." + StringUtils.getFilenameExtension(fileName); File dest = new File(dir, destFileName); if (file.renameTo(dest)) { - CompanyVendorFileVo ccf = new CompanyVendorFileVo(); + VendorFileVo ccf = new VendorFileVo(); ccf.setVendorId(companyVendor.getId()); ccf.setType(VendorFileType.EvaluationForm); ccf.setFilePath(dest.getAbsolutePath()); ccf.setSignDate(nextSignDate); ccf.setValid(true); - CompanyVendorFileVo saved = getCompanyVendorFileService().save(ccf); + VendorFileVo saved = getVendorFileService().save(ccf); Platform.runLater(() -> { CompanyVendorFileViewModel model = new CompanyVendorFileViewModel(); model.update(saved); @@ -169,12 +169,12 @@ public class VendorTabSkinFile for (File file : files) { File dest = new File(dir, file.getName()); if (file.renameTo(dest)) { - CompanyVendorFileVo ccf = new CompanyVendorFileVo(); + VendorFileVo ccf = new VendorFileVo(); ccf.setVendorId(companyVendor.getId()); ccf.setType(VendorFileType.General); ccf.setFilePath(dest.getAbsolutePath()); ccf.setValid(false); - CompanyVendorFileVo saved = getCompanyVendorFileService().save(ccf); + VendorFileVo saved = getVendorFileService().save(ccf); } } loadTableDataSet(); @@ -183,7 +183,7 @@ public class VendorTabSkinFile public void onFileReBuildingAction(ActionEvent event) { CompletableFuture.runAsync(() -> { try { - CompanyVendorVo companyVendor = getParent(); + VendorVo companyVendor = getParent(); if (getCompanyVendorService().reBuildingFiles(companyVendor, (level, msg) -> setStatus(msg))) { loadTableDataSet(); } @@ -194,18 +194,18 @@ public class VendorTabSkinFile } @Override - public CompanyVendorFileVo loadRowData(CompanyVendorFileViewModel row) { - return getCompanyVendorFileService().findById(row.getId().get()); + public VendorFileVo loadRowData(CompanyVendorFileViewModel row) { + return getVendorFileService().findById(row.getId().get()); } @Override - public CompanyVendorFileVo saveRowData(CompanyVendorFileVo entity) { - return getCompanyVendorFileService().save(entity); + public VendorFileVo saveRowData(VendorFileVo entity) { + return getVendorFileService().save(entity); } @Override - public void deleteRowData(CompanyVendorFileVo entity) { - getCompanyVendorFileService().delete(entity); + public void deleteRowData(VendorFileVo entity) { + getVendorFileService().delete(entity); } @Override @@ -272,7 +272,7 @@ public class VendorTabSkinFile deleteRow(selectedItem); - // getCompanyVendorService().deleteFileById(selectedItem.getId().get()); + // getVendorService().deleteFileById(selectedItem.getId().get()); // dataSet.remove(selectedItem); } @@ -285,8 +285,8 @@ public class VendorTabSkinFile public void onCalcNextSignDateAction(ActionEvent event) { UITools.showDialogAndWait("计算供应商下一个评价日期", "依据已有的供应商评价表和登记采购的合同计算下一个评价日期", ds -> { - CompanyVendorVo companyVendor = getCompanyVendorService().findById(viewModel.getId().get()); - LocalDate nextSignDate = getCompanyVendorFileService().getNextSignDate(companyVendor, msg -> { + VendorVo companyVendor = getCompanyVendorService().findById(viewModel.getId().get()); + LocalDate nextSignDate = getVendorFileService().getNextSignDate(companyVendor, msg -> { Platform.runLater(() -> { ds.add(msg); }); @@ -318,11 +318,11 @@ public class VendorTabSkinFile } } - public CompanyVendorFileService getCompanyVendorFileService() { - if (companyVendorFileService == null) { - companyVendorFileService = SpringApp.getBean(CompanyVendorFileService.class); + public VendorFileService getVendorFileService() { + if (vendorFileService == null) { + vendorFileService = SpringApp.getBean(VendorFileService.class); } - return companyVendorFileService; + return vendorFileService; } } diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/VendorWindowController.java b/client/src/main/java/com/ecep/contract/controller/vendor/VendorWindowController.java index f2e12d5..c4ee79b 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/VendorWindowController.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/VendorWindowController.java @@ -38,14 +38,14 @@ import com.ecep.contract.vo.CompanyVo; @Scope("prototype") @Component @FxmlPath("/ui/company/vendor/vendor.fxml") -public class CompanyVendorWindowController extends AbstEntityController { - private static final Logger logger = LoggerFactory.getLogger(CompanyVendorWindowController.class); +public class VendorWindowController extends AbstEntityController { + private static final Logger logger = LoggerFactory.getLogger(VendorWindowController.class); /** * 显示界面 */ public static void show(VendorVo companyVendor, Window window) { - show(CompanyVendorWindowController.class, CompanyVendorViewModel.from(companyVendor), window); + show(VendorWindowController.class, CompanyVendorViewModel.from(companyVendor), window); } public BorderPane root; @@ -85,9 +85,9 @@ public class CompanyVendorWindowController extends AbstEntityController new CompanyVendorTabSkinBase(this)); + registerTabSkin(baseInfoTab, tab -> new VendorTabSkinBase(this)); registerTabSkin(fileTab, tab -> new VendorTabSkinFile(this)); - registerTabSkin(entityTab, tab -> new CompanyVendorTabSkinEntity(this)); + registerTabSkin(entityTab, tab -> new VendorTabSkinEntity(this)); } @Override diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListManagerSkin.java b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListManagerSkin.java index 5181210..a03d9a0 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListManagerSkin.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListManagerSkin.java @@ -9,12 +9,12 @@ import javafx.event.ActionEvent; import javafx.scene.control.SelectionMode; import lombok.Setter; -public class CompanyVendorApprovedListManagerSkin - extends AbstEntityManagerSkin { +public class VendorApprovedListManagerSkin + extends AbstEntityManagerSkin { @Setter private VendorApprovedService service; - public CompanyVendorApprovedListManagerSkin(CompanyVendorApprovedListManagerWindowController controller) { + public VendorApprovedListManagerSkin(VendorApprovedListManagerWindowController controller) { super(controller); } @@ -35,7 +35,7 @@ public class CompanyVendorApprovedListManagerSkin @Override protected void onTableRowDoubleClickedAction(CompanyVendorApprovedListViewModel item) { - showInOwner(CompanyVendorApprovedListWindowController.class, item); + showInOwner(VendorApprovedListWindowController.class, item); } @Override @@ -44,6 +44,6 @@ public class CompanyVendorApprovedListManagerSkin CompanyVendorApprovedListViewModel viewModel = CompanyVendorApprovedListViewModel.from(list); dataSet.add(viewModel); - showInOwner(CompanyVendorApprovedListWindowController.class, viewModel); + showInOwner(VendorApprovedListWindowController.class, viewModel); } } diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListManagerWindowController.java b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListManagerWindowController.java index d8b550e..ee75eb4 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListManagerWindowController.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListManagerWindowController.java @@ -24,8 +24,8 @@ import javafx.stage.WindowEvent; @Scope("prototype") @Component @FxmlPath("/ui/company/vendor/vendor_approved_list_manager.fxml") -public class CompanyVendorApprovedListManagerWindowController - extends AbstManagerWindowController { +public class VendorApprovedListManagerWindowController + extends AbstManagerWindowController { public TableColumn idColumn; public TableColumn titleColumn; @@ -36,8 +36,8 @@ public class CompanyVendorApprovedListManagerWindowController private VendorApprovedService service; @Override - protected CompanyVendorApprovedListManagerSkin createDefaultSkin() { - CompanyVendorApprovedListManagerSkin skin = new CompanyVendorApprovedListManagerSkin(this); + protected VendorApprovedListManagerSkin createDefaultSkin() { + VendorApprovedListManagerSkin skin = new VendorApprovedListManagerSkin(this); skin.setService(service); return skin; } diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinBase.java b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinBase.java index 7e369ef..81b9acb 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinBase.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinBase.java @@ -10,11 +10,11 @@ import com.ecep.contract.vm.CompanyVendorApprovedListViewModel; import javafx.scene.control.Tab; import javafx.util.converter.LocalDateStringConverter; -public class CompanyVendorApprovedListTabSkinBase +public class VendorApprovedListTabSkinBase extends - AbstEntityBasedTabSkin + AbstEntityBasedTabSkin implements TabSkin { - public CompanyVendorApprovedListTabSkinBase(CompanyVendorApprovedListWindowController controller) { + public VendorApprovedListTabSkinBase(VendorApprovedListWindowController controller) { super(controller); } diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinFiles.java b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinFiles.java index a8d4bbc..3b63f53 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinFiles.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinFiles.java @@ -24,9 +24,9 @@ import javafx.scene.control.TableCell; import javafx.scene.control.TableColumn; @FxmlPath("/ui/company/vendor/vendor_approved_list-tab-file.fxml") -public class CompanyVendorApprovedListTabSkinFiles +public class VendorApprovedListTabSkinFiles extends - AbstEntityTableTabSkin + AbstEntityTableTabSkin implements TabSkin { private VendorApprovedFileService fileService; @@ -36,7 +36,7 @@ public class CompanyVendorApprovedListTabSkinFiles public TableColumn fileTable_signDateColumn; public TableColumn fileTable_descriptionColumn; - public CompanyVendorApprovedListTabSkinFiles(CompanyVendorApprovedListWindowController controller) { + public VendorApprovedListTabSkinFiles(VendorApprovedListWindowController controller) { super(controller); } diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinVendors.java b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinVendors.java index 8594d20..27b8038 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinVendors.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListTabSkinVendors.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import com.ecep.contract.VendorType; -import com.ecep.contract.controller.ComboBoxUtils; +import com.ecep.contract.util.ComboBoxUtils; import com.ecep.contract.controller.table.cell.VendorTypeTableCell; import com.ecep.contract.service.*; import com.ecep.contract.vo.*; @@ -12,7 +12,7 @@ import com.ecep.contract.vo.*; import com.ecep.contract.controller.tab.TabSkin; import com.ecep.contract.controller.table.AbstEntityTableTabSkin; import com.ecep.contract.controller.table.cell.CompanyVendorTableCell; -import com.ecep.contract.controller.vendor.CompanyVendorWindowController; +import com.ecep.contract.controller.vendor.VendorWindowController; import com.ecep.contract.util.BooleanConfigProperty; import com.ecep.contract.util.FxmlPath; import com.ecep.contract.util.IntegerConfigProperty; @@ -36,9 +36,9 @@ import javafx.scene.control.TableColumn; import lombok.Setter; @FxmlPath("/ui/company/vendor/vendor_approved_list-tab-vendor.fxml") -public class CompanyVendorApprovedListTabSkinVendors +public class VendorApprovedListTabSkinVendors extends - AbstEntityTableTabSkin + AbstEntityTableTabSkin implements TabSkin { @Setter private VendorApprovedItemService itemService; @@ -60,7 +60,7 @@ public class CompanyVendorApprovedListTabSkinVendors public CheckMenuItem logTypicallyVendorNoThreeYearContractDetailChecker; public Spinner qualifiedVendorEveryYearMinContractsSpinner; - public CompanyVendorApprovedListTabSkinVendors(CompanyVendorApprovedListWindowController controller) { + public VendorApprovedListTabSkinVendors(VendorApprovedListWindowController controller) { super(controller); } @@ -203,7 +203,7 @@ public class CompanyVendorApprovedListTabSkinVendors public void onVendorTableImportAction(ActionEvent event) { VendorApprovedVo approvedList = getParent(); - CompanyVendorApprovedListVendorImportTask task = new CompanyVendorApprovedListVendorImportTask(approvedList); + VendorApprovedListVendorImportTask task = new VendorApprovedListVendorImportTask(approvedList); task.setLogUnqualifiedVendor(logUnqualifiedVendorChecker.isSelected()); task.setLogTypicallyVendorNoThreeYearContract(logTypicallyVendorNoThreeYearContractChecker.isSelected()); @@ -244,7 +244,7 @@ public class CompanyVendorApprovedListTabSkinVendors public void onVendorTableShowVendorAction(ActionEvent event) { CompanyVendorApprovedItemViewModel selectedItem = getTableView().getSelectionModel().getSelectedItem(); VendorVo companyVendor = getVendorService().findById(selectedItem.getVendor().get()); - CompanyVendorWindowController.show(companyVendor, null); + VendorWindowController.show(companyVendor, null); } public void onVendorTableDeleteAction(ActionEvent event) { diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListVendorExportTask.java b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListVendorExportTask.java index 18d12a3..f4d6f86 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListVendorExportTask.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListVendorExportTask.java @@ -60,8 +60,8 @@ import lombok.Setter; /** * 导出供方名录 */ -public class CompanyVendorApprovedListVendorExportTask extends Tasker { - private static final Logger logger = LoggerFactory.getLogger(CompanyVendorApprovedListVendorExportTask.class); +public class VendorApprovedListVendorExportTask extends Tasker { + private static final Logger logger = LoggerFactory.getLogger(VendorApprovedListVendorExportTask.class); public static final String STR_CHANGE_VENDOR_TYPE_SHEET = "变更供应商类型"; @Setter @@ -388,7 +388,7 @@ public class CompanyVendorApprovedListVendorExportTask extends Tasker { setCellValue(sheet, "G" + (prefixRow + i), "合格").setCellStyle(borderStyle); setCellValue(sheet, "H" + (prefixRow + i), "").setCellStyle(borderStyle); - if (Objects.equals(item.getDescription(), CompanyVendorApprovedListVendorImportTask.STR_MEET_QUALIFIED)) { + if (Objects.equals(item.getDescription(), VendorApprovedListVendorImportTask.STR_MEET_QUALIFIED)) { // xx meetQualified.add(item); } diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListVendorImportTask.java b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListVendorImportTask.java index 81f46c2..b35172e 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListVendorImportTask.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListVendorImportTask.java @@ -37,8 +37,8 @@ import lombok.Setter; /** * 从现有的供应商中导入 */ -public class CompanyVendorApprovedListVendorImportTask extends Tasker { - private static final Logger logger = LoggerFactory.getLogger(CompanyVendorApprovedListVendorImportTask.class); +public class VendorApprovedListVendorImportTask extends Tasker { + private static final Logger logger = LoggerFactory.getLogger(VendorApprovedListVendorImportTask.class); // Meet qualified supplier standards public static final String STR_MEET_QUALIFIED = "符合合格供方标准"; public static final String STR_MEET_TYPICALLY = "符合一般供方标准"; @@ -54,7 +54,7 @@ public class CompanyVendorApprovedListVendorImportTask extends Tasker { private final AtomicInteger counter = new AtomicInteger(0); - public CompanyVendorApprovedListVendorImportTask(VendorApprovedVo approvedList) { + public VendorApprovedListVendorImportTask(VendorApprovedVo approvedList) { this.approvedList = approvedList; updateTitle("供方名录-供方导入"); } diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListWindowController.java b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListWindowController.java index f5b2114..5125dc3 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListWindowController.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/approved_list/VendorApprovedListWindowController.java @@ -34,13 +34,13 @@ import javafx.stage.WindowEvent; @Scope("prototype") @Component @FxmlPath("/ui/company/vendor/vendor_approved_list.fxml") -public class CompanyVendorApprovedListWindowController +public class VendorApprovedListWindowController extends AbstEntityController { - private static final Logger logger = LoggerFactory.getLogger(CompanyVendorApprovedListWindowController.class); + private static final Logger logger = LoggerFactory.getLogger(VendorApprovedListWindowController.class); public static void show(VendorApprovedVo list, Window window) { CompanyVendorApprovedListViewModel model = CompanyVendorApprovedListViewModel.from(list); - show(CompanyVendorApprovedListWindowController.class, model, window); + show(VendorApprovedListWindowController.class, model, window); } @Autowired @@ -73,9 +73,9 @@ public class CompanyVendorApprovedListWindowController @Override protected void registerTabSkins() { - registerTabSkin(baseInfoTab, tab -> new CompanyVendorApprovedListTabSkinBase(this)); - registerTabSkin(vendorTab, tab -> new CompanyVendorApprovedListTabSkinVendors(this)); - registerTabSkin(fileTab, tab -> new CompanyVendorApprovedListTabSkinFiles(this)); + registerTabSkin(baseInfoTab, tab -> new VendorApprovedListTabSkinBase(this)); + registerTabSkin(vendorTab, tab -> new VendorApprovedListTabSkinVendors(this)); + registerTabSkin(fileTab, tab -> new VendorApprovedListTabSkinFiles(this)); } @Override @@ -119,7 +119,7 @@ public class CompanyVendorApprovedListWindowController } public void onVendorTableExportAction(ActionEvent event) { - CompanyVendorApprovedListVendorExportTask task = new CompanyVendorApprovedListVendorExportTask(); + VendorApprovedListVendorExportTask task = new VendorApprovedListVendorExportTask(); task.setApprovedList(getEntity()); UITools.showTaskDialogAndWait("导出供方", task, null); } diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/bid/VendorBidWindowController.java b/client/src/main/java/com/ecep/contract/controller/vendor/bid/VendorBidWindowController.java index 6e6339d..93553fb 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/bid/VendorBidWindowController.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/bid/VendorBidWindowController.java @@ -1,4 +1,4 @@ -package com.ecep.contract.controller.vendor; +package com.ecep.contract.controller.vendor.bid; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/purchase/order/PurchaseOrderTabSkinBase.java b/client/src/main/java/com/ecep/contract/controller/vendor/purchase/order/PurchaseOrderTabSkinBase.java index 26e4aa1..eb2647b 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/purchase/order/PurchaseOrderTabSkinBase.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/purchase/order/PurchaseOrderTabSkinBase.java @@ -4,7 +4,6 @@ import com.ecep.contract.MyDateTimeUtils; import com.ecep.contract.SpringApp; import com.ecep.contract.controller.tab.AbstEntityBasedTabSkin; import com.ecep.contract.controller.tab.TabSkin; -import com.ecep.contract.controller.vendor.PurchaseOrderWindowController; import com.ecep.contract.converter.EmployeeStringConverter; import com.ecep.contract.service.CompanyService; import com.ecep.contract.service.ContractFileService; diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/purchase/order/PurchaseOrderTabSkinBillVoucher.java b/client/src/main/java/com/ecep/contract/controller/vendor/purchase/order/PurchaseOrderTabSkinBillVoucher.java index 1fc2764..b019ea8 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/purchase/order/PurchaseOrderTabSkinBillVoucher.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/purchase/order/PurchaseOrderTabSkinBillVoucher.java @@ -8,11 +8,8 @@ import com.ecep.contract.controller.table.AbstEntityTableTabSkin; import com.ecep.contract.controller.table.cell.EmployeeTableCell; import com.ecep.contract.controller.table.cell.InvoiceTableCell; import com.ecep.contract.controller.table.cell.LocalDateTimeTableCell; -import com.ecep.contract.controller.vendor.PurchaseBillVoucherWindowController; -import com.ecep.contract.controller.vendor.PurchaseOrderWindowController; +import com.ecep.contract.controller.vendor.purchase.purchase_bill.PurchaseBillVoucherWindowController; import com.ecep.contract.converter.EmployeeStringConverter; -import com.ecep.contract.converter.EntityStringConverter; -import com.ecep.contract.model.Invoice; import com.ecep.contract.service.InvoiceService; import com.ecep.contract.service.PurchaseBillVoucherService; import com.ecep.contract.util.FxmlPath; @@ -26,8 +23,6 @@ import javafx.scene.control.ContextMenu; import javafx.scene.control.MenuItem; import javafx.scene.control.Tab; import javafx.scene.control.TableColumn; -import javafx.scene.control.cell.TextFieldTableCell; -import javafx.util.StringConverter; import lombok.Setter; @FxmlPath("/ui/contract/purchase-orders-tab-bill-voucher.fxml") diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/purchase/order/PurchaseOrderTabSkinItems.java b/client/src/main/java/com/ecep/contract/controller/vendor/purchase/order/PurchaseOrderTabSkinItems.java index 3abb9b5..5630d37 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/purchase/order/PurchaseOrderTabSkinItems.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/purchase/order/PurchaseOrderTabSkinItems.java @@ -3,7 +3,6 @@ package com.ecep.contract.controller.vendor.purchase.order; import java.time.LocalDate; import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; @@ -13,20 +12,17 @@ import com.ecep.contract.SpringApp; import com.ecep.contract.controller.tab.TabSkin; import com.ecep.contract.controller.table.AbstEntityTableTabSkin; import com.ecep.contract.controller.table.cell.InventoryTableCell; -import com.ecep.contract.controller.vendor.PurchaseOrderWindowController; import com.ecep.contract.service.ContractService; import com.ecep.contract.service.InventoryService; import com.ecep.contract.service.PurchaseOrderItemService; import com.ecep.contract.service.PurchaseOrdersService; import com.ecep.contract.util.FxmlPath; -import com.ecep.contract.util.ProxyUtils; import com.ecep.contract.util.ParamUtils.Builder; import com.ecep.contract.vm.ContractItemComposeViewModel; import com.ecep.contract.vm.PurchaseOrderItemViewModel; import com.ecep.contract.vm.PurchaseOrderViewModel; import com.ecep.contract.vo.ContractItemVo; import com.ecep.contract.vo.ContractVo; -import com.ecep.contract.vo.InventoryVo; import com.ecep.contract.vo.PurchaseOrderItemVo; import com.ecep.contract.vo.PurchaseOrderVo; diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/purchase/order/PurchaseOrderWindowController.java b/client/src/main/java/com/ecep/contract/controller/vendor/purchase/order/PurchaseOrderWindowController.java index 625a0b1..50afc46 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/purchase/order/PurchaseOrderWindowController.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/purchase/order/PurchaseOrderWindowController.java @@ -1,4 +1,4 @@ -package com.ecep.contract.controller.vendor; +package com.ecep.contract.controller.vendor.purchase.order; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -8,9 +8,6 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import com.ecep.contract.controller.AbstEntityController; -import com.ecep.contract.controller.vendor.purchase.order.PurchaseOrderTabSkinBase; -import com.ecep.contract.controller.vendor.purchase.order.PurchaseOrderTabSkinBillVoucher; -import com.ecep.contract.controller.vendor.purchase.order.PurchaseOrderTabSkinItems; import com.ecep.contract.service.PurchaseOrdersService; import com.ecep.contract.util.FxmlPath; import com.ecep.contract.vm.PurchaseOrderViewModel; diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/purchase/purchase_bill/PurchaseBillVoucherTabSkinItems.java b/client/src/main/java/com/ecep/contract/controller/vendor/purchase/purchase_bill/PurchaseBillVoucherTabSkinItems.java index 6d2023d..04aeb9a 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/purchase/purchase_bill/PurchaseBillVoucherTabSkinItems.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/purchase/purchase_bill/PurchaseBillVoucherTabSkinItems.java @@ -1,9 +1,5 @@ package com.ecep.contract.controller.vendor.purchase.purchase_bill; -import java.util.Map; - -import org.controlsfx.control.spreadsheet.SpreadsheetCellEditor.IntegerEditor; - import com.ecep.contract.SpringApp; import com.ecep.contract.controller.tab.TabSkin; import com.ecep.contract.controller.table.AbstEntityTableTabSkin; @@ -11,7 +7,6 @@ import com.ecep.contract.controller.table.cell.ContractTableCell; import com.ecep.contract.controller.table.cell.InventoryTableCell; import com.ecep.contract.controller.table.cell.InvoiceTableCell; import com.ecep.contract.controller.table.cell.PurchaseOrderItemTableCell; -import com.ecep.contract.controller.vendor.PurchaseBillVoucherWindowController; import com.ecep.contract.service.ContractService; import com.ecep.contract.service.InventoryService; import com.ecep.contract.service.InvoiceService; @@ -21,12 +16,8 @@ import com.ecep.contract.util.FxmlPath; import com.ecep.contract.util.ParamUtils.Builder; import com.ecep.contract.vm.PurchaseBillVoucherItemViewModel; import com.ecep.contract.vm.PurchaseBillVoucherViewModel; -import com.ecep.contract.vo.ContractVo; -import com.ecep.contract.vo.InventoryVo; -import com.ecep.contract.vo.InvoiceVo; import com.ecep.contract.vo.PurchaseBillVoucherItemVo; import com.ecep.contract.vo.PurchaseBillVoucherVo; -import com.ecep.contract.vo.PurchaseOrderItemVo; import javafx.geometry.Pos; import javafx.scene.control.Tab; diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/purchase/purchase_bill/PurchaseBillVoucherWindowController.java b/client/src/main/java/com/ecep/contract/controller/vendor/purchase/purchase_bill/PurchaseBillVoucherWindowController.java index fc9e2c1..ff9c394 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/purchase/purchase_bill/PurchaseBillVoucherWindowController.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/purchase/purchase_bill/PurchaseBillVoucherWindowController.java @@ -1,4 +1,4 @@ -package com.ecep.contract.controller.vendor; +package com.ecep.contract.controller.vendor.purchase.purchase_bill; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; @@ -6,7 +6,6 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import com.ecep.contract.controller.AbstEntityController; -import com.ecep.contract.controller.vendor.purchase.purchase_bill.PurchaseBillVoucherTabSkinItems; import com.ecep.contract.service.PurchaseBillVoucherService; import com.ecep.contract.util.FxmlPath; import com.ecep.contract.vm.PurchaseBillVoucherViewModel; diff --git a/client/src/main/java/com/ecep/contract/converter/VendorStringConverter.java b/client/src/main/java/com/ecep/contract/converter/VendorStringConverter.java index 736ca52..2328038 100644 --- a/client/src/main/java/com/ecep/contract/converter/VendorStringConverter.java +++ b/client/src/main/java/com/ecep/contract/converter/VendorStringConverter.java @@ -11,12 +11,12 @@ import jakarta.annotation.PostConstruct; @Lazy @Component -public class CompanyVendorStringConverter extends EntityStringConverter { +public class VendorStringConverter extends EntityStringConverter { @Lazy @Autowired private VendorService service; - public CompanyVendorStringConverter() { + public VendorStringConverter() { } diff --git a/client/src/main/java/com/ecep/contract/service/ContractService.java b/client/src/main/java/com/ecep/contract/service/ContractService.java index 4aa4f35..0f3c93e 100644 --- a/client/src/main/java/com/ecep/contract/service/ContractService.java +++ b/client/src/main/java/com/ecep/contract/service/ContractService.java @@ -15,10 +15,9 @@ import org.springframework.stereotype.Service; import com.ecep.contract.MessageHolder; import com.ecep.contract.constant.ContractConstant; -import com.ecep.contract.model.ContractFile; import com.ecep.contract.util.ParamUtils; import com.ecep.contract.vm.ContractViewModel; -import com.ecep.contract.vo.CompanyVendorVo; +import com.ecep.contract.vo.VendorVo; import com.ecep.contract.vo.ContractFileVo; import com.ecep.contract.vo.ContractVo; import com.ecep.contract.vo.ProjectVo; @@ -138,7 +137,7 @@ public class ContractService extends QueryService throw new UnsupportedOperationException("Unimplemented method 'makePathAbsent'"); } - public List findAllByCompanyVendor(CompanyVendorVo vendor, LocalDate beginDate, LocalDate endDate) { + public List findAllByCompanyVendor(VendorVo vendor, LocalDate beginDate, LocalDate endDate) { return findAll(ParamUtils.builder() .equals("company", vendor.getCompanyId()) .between("setupDate", beginDate, endDate) diff --git a/client/src/main/java/com/ecep/contract/service/VendorApprovedFileService.java b/client/src/main/java/com/ecep/contract/service/VendorApprovedFileService.java index a1f2528..89e19f2 100644 --- a/client/src/main/java/com/ecep/contract/service/VendorApprovedFileService.java +++ b/client/src/main/java/com/ecep/contract/service/VendorApprovedFileService.java @@ -8,7 +8,7 @@ import com.ecep.contract.vo.VendorApprovedFileVo; import com.ecep.contract.vo.VendorApprovedVo; @Service -public class CompanyVendorApprovedFileService +public class VendorApprovedFileService extends QueryService { public VendorApprovedFileVo findByName(VendorApprovedVo approvedList, String name) { diff --git a/client/src/main/java/com/ecep/contract/service/VendorApprovedItemService.java b/client/src/main/java/com/ecep/contract/service/VendorApprovedItemService.java index 3381cb8..105084d 100644 --- a/client/src/main/java/com/ecep/contract/service/VendorApprovedItemService.java +++ b/client/src/main/java/com/ecep/contract/service/VendorApprovedItemService.java @@ -12,7 +12,7 @@ import com.ecep.contract.vo.VendorApprovedVo; import com.ecep.contract.vo.VendorVo; @Service -public class CompanyVendorApprovedItemService +public class VendorApprovedItemService extends QueryService { public List findAllByListAndVendor(VendorApprovedVo approvedList, diff --git a/client/src/main/java/com/ecep/contract/service/VendorApprovedService.java b/client/src/main/java/com/ecep/contract/service/VendorApprovedService.java index 1f15965..bd10dda 100644 --- a/client/src/main/java/com/ecep/contract/service/VendorApprovedService.java +++ b/client/src/main/java/com/ecep/contract/service/VendorApprovedService.java @@ -7,7 +7,7 @@ import com.ecep.contract.vm.CompanyVendorApprovedListViewModel; import com.ecep.contract.vo.VendorApprovedVo; @Service -public class CompanyVendorApprovedListService +public class VendorApprovedService extends QueryService { public boolean makePathAbsent(VendorApprovedVo list) { diff --git a/client/src/main/java/com/ecep/contract/service/VendorEntityService.java b/client/src/main/java/com/ecep/contract/service/VendorEntityService.java index dc7622b..f9f9b68 100644 --- a/client/src/main/java/com/ecep/contract/service/VendorEntityService.java +++ b/client/src/main/java/com/ecep/contract/service/VendorEntityService.java @@ -11,7 +11,7 @@ import com.ecep.contract.vo.VendorVo; import com.ecep.contract.vm.CompanyVendorEntityViewModel; @Service -public class CompanyVendorEntityService extends QueryService { +public class VendorEntityService extends QueryService { /** * 根据供应商ID查询关联实体列表 diff --git a/client/src/main/java/com/ecep/contract/service/VendorFileService.java b/client/src/main/java/com/ecep/contract/service/VendorFileService.java index da6348d..fce2d0e 100644 --- a/client/src/main/java/com/ecep/contract/service/VendorFileService.java +++ b/client/src/main/java/com/ecep/contract/service/VendorFileService.java @@ -21,7 +21,7 @@ import com.ecep.contract.vo.VendorFileVo; import com.ecep.contract.vo.VendorVo; @Service -public class CompanyVendorFileService extends QueryService { +public class VendorFileService extends QueryService { public LocalDate getNextSignDate(VendorVo companyVendor, Consumer state) { // TODO Auto-generated method stub diff --git a/client/src/main/java/com/ecep/contract/service/VendorService.java b/client/src/main/java/com/ecep/contract/service/VendorService.java index 661fe7e..7179421 100644 --- a/client/src/main/java/com/ecep/contract/service/VendorService.java +++ b/client/src/main/java/com/ecep/contract/service/VendorService.java @@ -25,13 +25,13 @@ import com.ecep.contract.vo.CompanyVo; import com.ecep.contract.vo.ContractVo; @Service -public class CompanyVendorService extends QueryService { +public class VendorService extends QueryService { @Autowired private CompanyService companyService; @Autowired private CompanyFileService companyFileService; @Autowired - private CompanyVendorFileService companyVendorFileService; + private VendorFileService vendorFileService; private File basePath; @@ -102,7 +102,7 @@ public class CompanyVendorService extends QueryService{ @Override diff --git a/client/src/main/java/com/ecep/contract/task/ContractKindSyncTask.java b/client/src/main/java/com/ecep/contract/task/ContractKindSyncTask.java index 04df43b..6cbe975 100644 --- a/client/src/main/java/com/ecep/contract/task/ContractKindSyncTask.java +++ b/client/src/main/java/com/ecep/contract/task/ContractKindSyncTask.java @@ -1,7 +1,6 @@ -package com.ecep.contract.controller; +package com.ecep.contract.task; import com.ecep.contract.MessageHolder; -import com.ecep.contract.task.Tasker; public class ContractKindSyncTask extends Tasker { @Override diff --git a/client/src/main/java/com/ecep/contract/task/ContractSyncAllTask.java b/client/src/main/java/com/ecep/contract/task/ContractSyncAllTask.java index 854764c..433e47b 100644 --- a/client/src/main/java/com/ecep/contract/task/ContractSyncAllTask.java +++ b/client/src/main/java/com/ecep/contract/task/ContractSyncAllTask.java @@ -1,7 +1,6 @@ -package com.ecep.contract.controller; +package com.ecep.contract.task; import com.ecep.contract.MessageHolder; -import com.ecep.contract.task.Tasker; public class ContractSyncAllTask extends Tasker { @Override diff --git a/client/src/main/java/com/ecep/contract/task/ContractTypeSyncTask.java b/client/src/main/java/com/ecep/contract/task/ContractTypeSyncTask.java index d187566..2bd736d 100644 --- a/client/src/main/java/com/ecep/contract/task/ContractTypeSyncTask.java +++ b/client/src/main/java/com/ecep/contract/task/ContractTypeSyncTask.java @@ -1,7 +1,6 @@ -package com.ecep.contract.controller; +package com.ecep.contract.task; import com.ecep.contract.MessageHolder; -import com.ecep.contract.task.Tasker; public class ContractTypeSyncTask extends Tasker { @Override diff --git a/client/src/main/java/com/ecep/contract/task/ContractVerifyComm.java b/client/src/main/java/com/ecep/contract/task/ContractVerifyComm.java index c58c92d..c39f741 100644 --- a/client/src/main/java/com/ecep/contract/task/ContractVerifyComm.java +++ b/client/src/main/java/com/ecep/contract/task/ContractVerifyComm.java @@ -13,6 +13,7 @@ import java.util.Locale; import java.util.Objects; import java.util.stream.Collectors; +import com.ecep.contract.service.*; import com.ecep.contract.vo.*; import org.springframework.util.StringUtils; @@ -25,29 +26,9 @@ import com.ecep.contract.SpringApp; import com.ecep.contract.controller.project.cost.ProjectCostImportItemsFromContractsTasker; import com.ecep.contract.model.Contract; import com.ecep.contract.model.ContractFileTypeLocal; -import com.ecep.contract.service.CompanyCustomerFileService; -import com.ecep.contract.service.CompanyCustomerService; -import com.ecep.contract.service.CompanyExtendInfoService; -import com.ecep.contract.service.CompanyFileService; -import com.ecep.contract.service.CompanyService; -import com.ecep.contract.service.CompanyVendorService; -import com.ecep.contract.service.ContractBidVendorService; -import com.ecep.contract.service.ContractFileService; -import com.ecep.contract.service.ContractFileTypeService; -import com.ecep.contract.service.ContractService; -import com.ecep.contract.service.EmployeeService; -import com.ecep.contract.service.ExtendVendorInfoService; -import com.ecep.contract.service.ProjectBidService; -import com.ecep.contract.service.ProjectCostService; -import com.ecep.contract.service.ProjectQuotationService; -import com.ecep.contract.service.ProjectSaleTypeRequireFileTypeService; -import com.ecep.contract.service.ProjectSaleTypeService; -import com.ecep.contract.service.ProjectService; -import com.ecep.contract.service.VendorGroupRequireFileTypeService; -import com.ecep.contract.service.VendorGroupService; +import com.ecep.contract.service.VendorService; import javafx.beans.property.SimpleBooleanProperty; -import javafx.collections.FXCollections; import javafx.collections.ObservableMap; import javafx.util.converter.NumberStringConverter; import lombok.Data; @@ -71,7 +52,7 @@ public class ContractVerifyComm { private CompanyService companyService; private CompanyFileService companyFileService; // Vendor - private CompanyVendorService companyVendorService; + private VendorService vendorService; private VendorGroupService vendorGroupService; private VendorGroupRequireFileTypeService vendorGroupRequireFileTypeService; private ExtendVendorInfoService extendVendorInfoService; @@ -187,11 +168,11 @@ public class ContractVerifyComm { return extendVendorInfoService; } - private CompanyVendorService getCompanyVendorService() { - if (companyVendorService == null) { - companyVendorService = SpringApp.getBean(CompanyVendorService.class); + private VendorService getVendorService() { + if (vendorService == null) { + vendorService = SpringApp.getBean(VendorService.class); } - return companyVendorService; + return vendorService; } private CompanyCustomerService getCompanyCustomerService() { @@ -425,7 +406,7 @@ public class ContractVerifyComm { } } if (verifyVendor.get()) { - getCompanyVendorService().verify(contract, holder); + getVendorService().verify(contract, holder); } if (verifyVendorFiles.get()) { diff --git a/client/src/main/java/com/ecep/contract/task/CustomerClassSyncTask.java b/client/src/main/java/com/ecep/contract/task/CustomerClassSyncTask.java index bf1f6c5..79a224f 100644 --- a/client/src/main/java/com/ecep/contract/task/CustomerClassSyncTask.java +++ b/client/src/main/java/com/ecep/contract/task/CustomerClassSyncTask.java @@ -1,7 +1,6 @@ -package com.ecep.contract.controller; +package com.ecep.contract.task; import com.ecep.contract.MessageHolder; -import com.ecep.contract.task.Tasker; public class CustomerClassSyncTask extends Tasker { diff --git a/client/src/main/java/com/ecep/contract/task/VendorClassSyncTask.java b/client/src/main/java/com/ecep/contract/task/VendorClassSyncTask.java index 5a72769..5c456fb 100644 --- a/client/src/main/java/com/ecep/contract/task/VendorClassSyncTask.java +++ b/client/src/main/java/com/ecep/contract/task/VendorClassSyncTask.java @@ -1,7 +1,6 @@ -package com.ecep.contract.controller; +package com.ecep.contract.task; import com.ecep.contract.MessageHolder; -import com.ecep.contract.task.Tasker; public class VendorClassSyncTask extends Tasker { @Override diff --git a/client/src/main/java/com/ecep/contract/util/ComboBoxUtils.java b/client/src/main/java/com/ecep/contract/util/ComboBoxUtils.java index b2083ca..f4ab366 100644 --- a/client/src/main/java/com/ecep/contract/util/ComboBoxUtils.java +++ b/client/src/main/java/com/ecep/contract/util/ComboBoxUtils.java @@ -1,4 +1,4 @@ -package com.ecep.contract.controller; +package com.ecep.contract.util; import java.util.List; diff --git a/client/src/main/java/com/ecep/contract/util/TableViewUtils.java b/client/src/main/java/com/ecep/contract/util/TableViewUtils.java index 757dd53..b81da87 100644 --- a/client/src/main/java/com/ecep/contract/util/TableViewUtils.java +++ b/client/src/main/java/com/ecep/contract/util/TableViewUtils.java @@ -34,7 +34,7 @@ public class TableViewUtils { return new Sort.Order(dir, id); }).toList(); } - + @SuppressWarnings("unchecked") public static void bindDoubleClicked(TableView table, Consumer consumer) { table.setOnMouseClicked(event -> { if (event.getClickCount() == 2 && event.getButton() == MouseButton.PRIMARY) { diff --git a/client/src/main/java/com/ecep/contract/vm/CompanyVendorApprovedFileViewModel.java b/client/src/main/java/com/ecep/contract/vm/CompanyVendorApprovedFileViewModel.java index cfac5d6..ecefff9 100644 --- a/client/src/main/java/com/ecep/contract/vm/CompanyVendorApprovedFileViewModel.java +++ b/client/src/main/java/com/ecep/contract/vm/CompanyVendorApprovedFileViewModel.java @@ -3,7 +3,7 @@ package com.ecep.contract.vm; import java.time.LocalDate; import java.util.Objects; -import com.ecep.contract.vo.CompanyVendorApprovedFileVo; +import com.ecep.contract.vo.VendorApprovedFileVo; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleStringProperty; @@ -14,9 +14,9 @@ import lombok.ToString; @Data @EqualsAndHashCode(callSuper = false) @ToString -public class CompanyVendorApprovedFileViewModel extends IdentityViewModel { +public class CompanyVendorApprovedFileViewModel extends IdentityViewModel { - public static CompanyVendorApprovedFileViewModel from(CompanyVendorApprovedFileVo companyVendorApprovedItemFile) { + public static CompanyVendorApprovedFileViewModel from(VendorApprovedFileVo companyVendorApprovedItemFile) { CompanyVendorApprovedFileViewModel viewModel = new CompanyVendorApprovedFileViewModel(); viewModel.update(companyVendorApprovedItemFile); return viewModel; @@ -35,7 +35,7 @@ public class CompanyVendorApprovedFileViewModel extends IdentityViewModel { - public static CompanyVendorApprovedItemViewModel from(CompanyVendorApprovedItemVo item) { +public class CompanyVendorApprovedItemViewModel extends IdentityViewModel { + public static CompanyVendorApprovedItemViewModel from(VendorApprovedItemVo item) { CompanyVendorApprovedItemViewModel model = new CompanyVendorApprovedItemViewModel(); model.update(item); return model; @@ -29,7 +29,7 @@ public class CompanyVendorApprovedItemViewModel extends IdentityViewModel { + extends IdentityViewModel { private SimpleStringProperty title = new SimpleStringProperty(); private SimpleObjectProperty publishDate = new SimpleObjectProperty<>(); private SimpleStringProperty path = new SimpleStringProperty(); private SimpleStringProperty description = new SimpleStringProperty(); - public static CompanyVendorApprovedListViewModel from(CompanyVendorApprovedListVo list) { + public static CompanyVendorApprovedListViewModel from(VendorApprovedVo list) { CompanyVendorApprovedListViewModel model = new CompanyVendorApprovedListViewModel(); model.update(list); return model; } @Override - protected void updateFrom(CompanyVendorApprovedListVo v) { + protected void updateFrom(VendorApprovedVo v) { super.updateFrom(v); getTitle().set(v.getTitle()); getPublishDate().set(v.getPublishDate()); @@ -35,7 +35,7 @@ public class CompanyVendorApprovedListViewModel } @Override - public boolean copyTo(CompanyVendorApprovedListVo v) { + public boolean copyTo(VendorApprovedVo v) { boolean modified = super.copyTo(v); if (!Objects.equals(title.get(), v.getTitle())) { diff --git a/client/src/main/java/com/ecep/contract/vm/CompanyVendorEntityViewModel.java b/client/src/main/java/com/ecep/contract/vm/CompanyVendorEntityViewModel.java index 0844afb..5a3f6a9 100644 --- a/client/src/main/java/com/ecep/contract/vm/CompanyVendorEntityViewModel.java +++ b/client/src/main/java/com/ecep/contract/vm/CompanyVendorEntityViewModel.java @@ -3,7 +3,7 @@ package com.ecep.contract.vm; import java.time.LocalDate; import java.time.LocalDateTime; -import com.ecep.contract.vo.CompanyVendorEntityVo; +import com.ecep.contract.vo.VendorEntityVo; import javafx.beans.property.SimpleObjectProperty; import lombok.Data; @@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) -public class CompanyVendorEntityViewModel extends IdentityViewModel { +public class CompanyVendorEntityViewModel extends IdentityViewModel { private SimpleObjectProperty vendorId = new SimpleObjectProperty<>(); private SimpleObjectProperty name = new SimpleObjectProperty<>(); private SimpleObjectProperty abbName = new SimpleObjectProperty<>(); @@ -27,7 +27,7 @@ public class CompanyVendorEntityViewModel extends IdentityViewModel fetchedTime = new SimpleObjectProperty<>(); @Override - protected void updateFrom(CompanyVendorEntityVo v) { + protected void updateFrom(VendorEntityVo v) { super.updateFrom(v); if (v.getVendorId() != null) { vendorId.set(v.getVendorId()); @@ -51,7 +51,7 @@ public class CompanyVendorEntityViewModel extends IdentityViewModel { +public class CompanyVendorFileViewModel extends IdentityViewModel { /** * */ @@ -35,7 +35,7 @@ public class CompanyVendorFileViewModel extends IdentityViewModel { +public class CompanyVendorViewModel extends IdentityViewModel { private SimpleStringProperty code = new SimpleStringProperty(); private SimpleStringProperty state = new SimpleStringProperty(); @@ -68,13 +68,13 @@ public class CompanyVendorViewModel extends IdentityViewModel { private SimpleObjectProperty created = new SimpleObjectProperty<>(); private SimpleIntegerProperty version = new SimpleIntegerProperty(); - public static CompanyVendorViewModel from(CompanyVendorVo companyVendor) { + public static CompanyVendorViewModel from(VendorVo companyVendor) { CompanyVendorViewModel model = new CompanyVendorViewModel(); model.update(companyVendor); return model; } - public void updateFrom(CompanyVendorVo v) { + public void updateFrom(VendorVo v) { super.updateFrom(v); // getState().set(v.getState()); getType().set(v.getType()); @@ -100,7 +100,7 @@ public class CompanyVendorViewModel extends IdentityViewModel { version.set(v.getVersion()); } - public boolean copyTo(CompanyVendorVo v) { + public boolean copyTo(VendorVo v) { boolean modified = super.copyTo(v); if (!Objects.equals(type.get(), v.getType())) { v.setType(type.get()); diff --git a/client/src/main/java/com/ecep/contract/vm/VendorEntityViewModel.java b/client/src/main/java/com/ecep/contract/vm/VendorEntityViewModel.java index b6a4951..69db3bd 100644 --- a/client/src/main/java/com/ecep/contract/vm/VendorEntityViewModel.java +++ b/client/src/main/java/com/ecep/contract/vm/VendorEntityViewModel.java @@ -4,7 +4,7 @@ import java.time.LocalDate; import java.util.Objects; import com.ecep.contract.model.Vendor; -import com.ecep.contract.model.CompanyVendorEntity; +import com.ecep.contract.model.VendorEntity; import com.ecep.contract.model.Employee; import com.ecep.contract.model.VendorCatalog; @@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) -public class VendorEntityViewModel extends IdentityViewModel { +public class VendorEntityViewModel extends IdentityViewModel { private SimpleStringProperty name = new SimpleStringProperty(); private SimpleStringProperty abbName = new SimpleStringProperty(); private SimpleStringProperty code = new SimpleStringProperty(); @@ -41,14 +41,14 @@ public class VendorEntityViewModel extends IdentityViewModel + fx:controller="com.ecep.contract.controller.cloud.u8.YongYouU8ManagerWindowController"> diff --git a/client/src/main/resources/ui/company/bank-account.fxml b/client/src/main/resources/ui/company/bank-account.fxml index ec05c03..c02f781 100644 --- a/client/src/main/resources/ui/company/bank-account.fxml +++ b/client/src/main/resources/ui/company/bank-account.fxml @@ -7,7 +7,7 @@ + fx:controller="com.ecep.contract.controller.company.bank_account.BankAccountWindowController">
diff --git a/client/src/main/resources/ui/company/company_old_name.fxml b/client/src/main/resources/ui/company/company_old_name.fxml index 57ddb85..e5fe47d 100644 --- a/client/src/main/resources/ui/company/company_old_name.fxml +++ b/client/src/main/resources/ui/company/company_old_name.fxml @@ -26,7 +26,7 @@ +fx:controller="com.ecep.contract.controller.company.old_name.CompanyOldNameWindowController">
diff --git a/client/src/main/resources/ui/company/vendor/vendor-tab-entity.fxml b/client/src/main/resources/ui/company/vendor/vendor-tab-entity.fxml index 2713997..7a017c1 100644 --- a/client/src/main/resources/ui/company/vendor/vendor-tab-entity.fxml +++ b/client/src/main/resources/ui/company/vendor/vendor-tab-entity.fxml @@ -5,7 +5,7 @@ + fx:controller="com.ecep.contract.controller.vendor.VendorTabSkinEntity"> diff --git a/client/src/main/resources/ui/company/vendor/vendor.fxml b/client/src/main/resources/ui/company/vendor/vendor.fxml index 464f783..7a3c547 100644 --- a/client/src/main/resources/ui/company/vendor/vendor.fxml +++ b/client/src/main/resources/ui/company/vendor/vendor.fxml @@ -22,7 +22,7 @@ - +
diff --git a/client/src/main/resources/ui/company/vendor/vendor_approved_list-tab-file.fxml b/client/src/main/resources/ui/company/vendor/vendor_approved_list-tab-file.fxml index 3839926..d2dfcee 100644 --- a/client/src/main/resources/ui/company/vendor/vendor_approved_list-tab-file.fxml +++ b/client/src/main/resources/ui/company/vendor/vendor_approved_list-tab-file.fxml @@ -4,7 +4,7 @@ + fx:controller="com.ecep.contract.controller.vendor.approved_list.VendorApprovedListTabSkinFiles"> diff --git a/client/src/main/resources/ui/company/vendor/vendor_approved_list-tab-vendor.fxml b/client/src/main/resources/ui/company/vendor/vendor_approved_list-tab-vendor.fxml index 78ffe2f..1f9783b 100644 --- a/client/src/main/resources/ui/company/vendor/vendor_approved_list-tab-vendor.fxml +++ b/client/src/main/resources/ui/company/vendor/vendor_approved_list-tab-vendor.fxml @@ -4,7 +4,7 @@ + fx:controller="com.ecep.contract.controller.vendor.approved_list.VendorApprovedListTabSkinVendors"> diff --git a/client/src/main/resources/ui/company/vendor/vendor_approved_list.fxml b/client/src/main/resources/ui/company/vendor/vendor_approved_list.fxml index e6977e1..f9b7c99 100644 --- a/client/src/main/resources/ui/company/vendor/vendor_approved_list.fxml +++ b/client/src/main/resources/ui/company/vendor/vendor_approved_list.fxml @@ -9,7 +9,7 @@ + fx:controller="com.ecep.contract.controller.vendor.approved_list.VendorApprovedListWindowController">
diff --git a/client/src/main/resources/ui/company/vendor/vendor_approved_list_manager.fxml b/client/src/main/resources/ui/company/vendor/vendor_approved_list_manager.fxml index e377a18..ca48636 100644 --- a/client/src/main/resources/ui/company/vendor/vendor_approved_list_manager.fxml +++ b/client/src/main/resources/ui/company/vendor/vendor_approved_list_manager.fxml @@ -3,7 +3,7 @@ + fx:controller="com.ecep.contract.controller.vendor.approved_list.VendorApprovedListManagerWindowController"> diff --git a/client/src/main/resources/ui/company/vendor/vendor_manager.fxml b/client/src/main/resources/ui/company/vendor/vendor_manager.fxml index de7634c..ca35886 100644 --- a/client/src/main/resources/ui/company/vendor/vendor_manager.fxml +++ b/client/src/main/resources/ui/company/vendor/vendor_manager.fxml @@ -4,7 +4,7 @@ + fx:controller="com.ecep.contract.controller.vendor.VendorManagerWindowController"> diff --git a/common/src/main/java/com/ecep/contract/model/Vendor.java b/common/src/main/java/com/ecep/contract/model/Vendor.java index ee677af..1c40e7e 100644 --- a/common/src/main/java/com/ecep/contract/model/Vendor.java +++ b/common/src/main/java/com/ecep/contract/model/Vendor.java @@ -10,7 +10,7 @@ import org.hibernate.annotations.ColumnDefault; import com.ecep.contract.VendorType; import com.ecep.contract.util.HibernateProxyUtils; -import com.ecep.contract.vo.CompanyVendorVo; +import com.ecep.contract.vo.VendorVo; import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.Column; @@ -34,7 +34,7 @@ import lombok.ToString; @Entity @Table(name = "COMPANY_VENDOR", schema = "supplier_ms") @ToString -public class Vendor implements IdentityEntity, CompanyBasedEntity, Serializable, Voable { +public class Vendor implements IdentityEntity, CompanyBasedEntity, Serializable, Voable { private static final long serialVersionUID = 1L; @Id @Column(name = "ID", nullable = false) @@ -58,7 +58,7 @@ public class Vendor implements IdentityEntity, CompanyBasedEntity, Serializable, @OneToMany(mappedBy = "vendor", fetch = FetchType.LAZY) @JsonIgnore @ToString.Exclude - private List entities; + private List entities; @ManyToOne @JoinColumn(name = "VEN_CLS") @@ -124,8 +124,8 @@ public class Vendor implements IdentityEntity, CompanyBasedEntity, Serializable, } @Override - public CompanyVendorVo toVo() { - CompanyVendorVo vo = new CompanyVendorVo(); + public VendorVo toVo() { + VendorVo vo = new VendorVo(); vo.setId(id); vo.setType(type); vo.setProtocolProvider(protocolProvider); diff --git a/common/src/main/java/com/ecep/contract/model/VendorApproved.java b/common/src/main/java/com/ecep/contract/model/VendorApproved.java index 5bd4d79..fe32395 100644 --- a/common/src/main/java/com/ecep/contract/model/VendorApproved.java +++ b/common/src/main/java/com/ecep/contract/model/VendorApproved.java @@ -5,7 +5,7 @@ import java.time.LocalDate; import java.util.Objects; import com.ecep.contract.util.HibernateProxyUtils; -import com.ecep.contract.vo.CompanyVendorApprovedListVo; +import com.ecep.contract.vo.VendorApprovedVo; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -27,7 +27,7 @@ import lombok.ToString; @Entity @Table(name = "COMPANY_VENDOR_APPROVED") @ToString -public class VendorApprovedList implements IdentityEntity, Serializable, Voable { +public class VendorApproved implements IdentityEntity, Serializable, Voable { private static final long serialVersionUID = 1L; @Id @@ -67,7 +67,7 @@ public class VendorApprovedList implements IdentityEntity, Serializable, Voable< if (HibernateProxyUtils.isNotEffectiveClassEquals(object, this)) { return false; } - VendorApprovedList that = (VendorApprovedList) object; + VendorApproved that = (VendorApproved) object; return getId() != null && Objects.equals(getId(), that.getId()); } @@ -77,8 +77,8 @@ public class VendorApprovedList implements IdentityEntity, Serializable, Voable< } @Override - public CompanyVendorApprovedListVo toVo() { - CompanyVendorApprovedListVo vo = new CompanyVendorApprovedListVo(); + public VendorApprovedVo toVo() { + VendorApprovedVo vo = new VendorApprovedVo(); vo.setId(getId()); vo.setTitle(getTitle()); vo.setPublishDate(getPublishDate()); diff --git a/common/src/main/java/com/ecep/contract/model/VendorApprovedFile.java b/common/src/main/java/com/ecep/contract/model/VendorApprovedFile.java index ed00068..281678b 100644 --- a/common/src/main/java/com/ecep/contract/model/VendorApprovedFile.java +++ b/common/src/main/java/com/ecep/contract/model/VendorApprovedFile.java @@ -5,7 +5,7 @@ import java.time.LocalDate; import java.util.Objects; import com.ecep.contract.util.HibernateProxyUtils; -import com.ecep.contract.vo.CompanyVendorApprovedFileVo; +import com.ecep.contract.vo.VendorApprovedFileVo; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -28,7 +28,7 @@ import lombok.ToString; @Entity @Table(name = "COMPANY_VENDOR_APPROVED_FILE") @ToString -public class CompanyVendorApprovedFile implements IdentityEntity, Serializable, Voable { +public class VendorApprovedFile implements IdentityEntity, Serializable, Voable { private static final long serialVersionUID = 1L; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -38,7 +38,7 @@ public class CompanyVendorApprovedFile implements IdentityEntity, Serializable, @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "LIST_ID", nullable = false) @ToString.Exclude - private VendorApprovedList list; + private VendorApproved list; /** * 文件名，不含目录，目录使用目录的目录 @@ -67,7 +67,7 @@ public class CompanyVendorApprovedFile implements IdentityEntity, Serializable, if (HibernateProxyUtils.isNotEffectiveClassEquals(object, this)) { return false; } - CompanyVendorApprovedFile that = (CompanyVendorApprovedFile) object; + VendorApprovedFile that = (VendorApprovedFile) object; return getId() != null && Objects.equals(getId(), that.getId()); } @@ -77,8 +77,8 @@ public class CompanyVendorApprovedFile implements IdentityEntity, Serializable, } @Override - public CompanyVendorApprovedFileVo toVo() { - CompanyVendorApprovedFileVo vo = new CompanyVendorApprovedFileVo(); + public VendorApprovedFileVo toVo() { + VendorApprovedFileVo vo = new VendorApprovedFileVo(); vo.setId(getId()); vo.setListId(getList() != null ? getList().getId() : null); vo.setFileName(getFileName()); diff --git a/common/src/main/java/com/ecep/contract/model/VendorApprovedItem.java b/common/src/main/java/com/ecep/contract/model/VendorApprovedItem.java index 207b5d1..caedcaf 100644 --- a/common/src/main/java/com/ecep/contract/model/VendorApprovedItem.java +++ b/common/src/main/java/com/ecep/contract/model/VendorApprovedItem.java @@ -5,7 +5,7 @@ import java.util.Objects; import com.ecep.contract.VendorType; import com.ecep.contract.util.HibernateProxyUtils; -import com.ecep.contract.vo.CompanyVendorApprovedItemVo; +import com.ecep.contract.vo.VendorApprovedItemVo; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -28,7 +28,7 @@ import lombok.ToString; @Entity @Table(name = "COMPANY_VENDOR_APPROVED_ITEM") @ToString -public class CompanyVendorApprovedItem implements IdentityEntity, Serializable, Voable { +public class VendorApprovedItem implements IdentityEntity, Serializable, Voable { private static final long serialVersionUID = 1L; @Id @@ -39,7 +39,7 @@ public class CompanyVendorApprovedItem implements IdentityEntity, Serializable, @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "LIST_ID", nullable = false) @ToString.Exclude - private VendorApprovedList list; + private VendorApproved list; /** * 供应商名称，有可能改名了，所以存历史名称 @@ -73,7 +73,7 @@ public class CompanyVendorApprovedItem implements IdentityEntity, Serializable, if (HibernateProxyUtils.isNotEffectiveClassEquals(object, this)) { return false; } - CompanyVendorApprovedItem that = (CompanyVendorApprovedItem) object; + VendorApprovedItem that = (VendorApprovedItem) object; return getId() != null && Objects.equals(getId(), that.getId()); } @@ -83,8 +83,8 @@ public class CompanyVendorApprovedItem implements IdentityEntity, Serializable, } @Override - public CompanyVendorApprovedItemVo toVo() { - CompanyVendorApprovedItemVo vo = new CompanyVendorApprovedItemVo(); + public VendorApprovedItemVo toVo() { + VendorApprovedItemVo vo = new VendorApprovedItemVo(); vo.setId(getId()); vo.setListId(getList() != null ? getList().getId() : null); vo.setVendorId(getVendor() != null ? getVendor().getId() : null); diff --git a/common/src/main/java/com/ecep/contract/model/VendorEntity.java b/common/src/main/java/com/ecep/contract/model/VendorEntity.java index d4a6174..c5f4331 100644 --- a/common/src/main/java/com/ecep/contract/model/VendorEntity.java +++ b/common/src/main/java/com/ecep/contract/model/VendorEntity.java @@ -6,7 +6,7 @@ import java.time.LocalDateTime; import java.util.Objects; import com.ecep.contract.util.HibernateProxyUtils; -import com.ecep.contract.vo.CompanyVendorEntityVo; +import com.ecep.contract.vo.VendorEntityVo; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -31,7 +31,7 @@ import lombok.ToString; }) @ToString -public class CompanyVendorEntity implements IdentityEntity, Serializable, Voable { +public class VendorEntity implements IdentityEntity, Serializable, Voable { private static final long serialVersionUID = 1L; @Id @Column(name = "ID", nullable = false) @@ -102,7 +102,7 @@ public class CompanyVendorEntity implements IdentityEntity, Serializable, Voable return true; if (object == null || HibernateProxyUtils.isNotEffectiveClassEquals(this, object)) return false; - CompanyVendorEntity that = (CompanyVendorEntity) object; + VendorEntity that = (VendorEntity) object; return getId() != null && Objects.equals(getId(), that.getId()); } @@ -112,8 +112,8 @@ public class CompanyVendorEntity implements IdentityEntity, Serializable, Voable } @Override - public CompanyVendorEntityVo toVo() { - CompanyVendorEntityVo vo = new CompanyVendorEntityVo(); + public VendorEntityVo toVo() { + VendorEntityVo vo = new VendorEntityVo(); vo.setId(id); if (vendor != null) { vo.setVendorId(vendor.getId()); diff --git a/common/src/main/java/com/ecep/contract/model/VendorFile.java b/common/src/main/java/com/ecep/contract/model/VendorFile.java index 44ba012..09c90ef 100644 --- a/common/src/main/java/com/ecep/contract/model/VendorFile.java +++ b/common/src/main/java/com/ecep/contract/model/VendorFile.java @@ -6,7 +6,7 @@ import java.util.Objects; import com.ecep.contract.VendorFileType; import com.ecep.contract.util.HibernateProxyUtils; -import com.ecep.contract.vo.CompanyVendorFileVo; +import com.ecep.contract.vo.VendorFileVo; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -31,7 +31,7 @@ import lombok.ToString; @Entity @Table(name = "COMPANY_VENDOR_FILE") @ToString -public class CompanyVendorFile implements CompanyBasicFile, Serializable, Voable { +public class VendorFile implements CompanyBasicFile, Serializable, Voable { private static final long serialVersionUID = 1L; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -77,7 +77,7 @@ public class CompanyVendorFile implements CompanyBasicFile, Seri if (HibernateProxyUtils.isNotEffectiveClassEquals(object, this)) { return false; } - CompanyVendorFile that = (CompanyVendorFile) object; + VendorFile that = (VendorFile) object; return getId() != null && Objects.equals(getId(), that.getId()); } @@ -87,8 +87,8 @@ public class CompanyVendorFile implements CompanyBasicFile, Seri } @Override - public CompanyVendorFileVo toVo() { - CompanyVendorFileVo vo = new CompanyVendorFileVo(); + public VendorFileVo toVo() { + VendorFileVo vo = new VendorFileVo(); vo.setId(getId()); if (getVendor() != null) { vo.setVendorId(getVendor().getId()); diff --git a/common/src/main/java/com/ecep/contract/vo/VendorApprovedFileVo.java b/common/src/main/java/com/ecep/contract/vo/VendorApprovedFileVo.java index 8e3d3b3..480738d 100644 --- a/common/src/main/java/com/ecep/contract/vo/VendorApprovedFileVo.java +++ b/common/src/main/java/com/ecep/contract/vo/VendorApprovedFileVo.java @@ -5,7 +5,7 @@ import java.time.LocalDate; import lombok.Data; @Data -public class CompanyVendorApprovedFileVo implements IdentityEntity { +public class VendorApprovedFileVo implements IdentityEntity { private Integer id; private Integer listId; private String fileName; diff --git a/common/src/main/java/com/ecep/contract/vo/VendorApprovedItemVo.java b/common/src/main/java/com/ecep/contract/vo/VendorApprovedItemVo.java index 64a920d..6d3826d 100644 --- a/common/src/main/java/com/ecep/contract/vo/VendorApprovedItemVo.java +++ b/common/src/main/java/com/ecep/contract/vo/VendorApprovedItemVo.java @@ -9,7 +9,7 @@ import lombok.Data; * 供应商审批项目VO类 */ @Data -public class CompanyVendorApprovedItemVo implements IdentityEntity { +public class VendorApprovedItemVo implements IdentityEntity { private Integer id; private Integer listId; private Integer vendorId; diff --git a/common/src/main/java/com/ecep/contract/vo/VendorApprovedVo.java b/common/src/main/java/com/ecep/contract/vo/VendorApprovedVo.java index d985790..59f896b 100644 --- a/common/src/main/java/com/ecep/contract/vo/VendorApprovedVo.java +++ b/common/src/main/java/com/ecep/contract/vo/VendorApprovedVo.java @@ -10,7 +10,7 @@ import lombok.Data; * 合格供应商名录VO类 */ @Data -public class CompanyVendorApprovedListVo implements IdentityEntity { +public class VendorApprovedVo implements IdentityEntity { private Integer id; private String title; private LocalDate publishDate; diff --git a/common/src/main/java/com/ecep/contract/vo/VendorEntityVo.java b/common/src/main/java/com/ecep/contract/vo/VendorEntityVo.java index 2ce386c..d279a9a 100644 --- a/common/src/main/java/com/ecep/contract/vo/VendorEntityVo.java +++ b/common/src/main/java/com/ecep/contract/vo/VendorEntityVo.java @@ -11,7 +11,7 @@ import lombok.Data; * 供应商的关联详细项VO类 */ @Data -public class CompanyVendorEntityVo implements IdentityEntity { +public class VendorEntityVo implements IdentityEntity { private Integer id; private Integer vendorId; private String name; diff --git a/common/src/main/java/com/ecep/contract/vo/VendorFileVo.java b/common/src/main/java/com/ecep/contract/vo/VendorFileVo.java index c6dc5a4..ca6375f 100644 --- a/common/src/main/java/com/ecep/contract/vo/VendorFileVo.java +++ b/common/src/main/java/com/ecep/contract/vo/VendorFileVo.java @@ -11,7 +11,7 @@ import lombok.Data; * 供应商的文件VO类 */ @Data -public class CompanyVendorFileVo implements IdentityEntity { +public class VendorFileVo implements IdentityEntity { private Integer id; private Integer vendorId; private VendorFileType type; diff --git a/common/src/main/java/com/ecep/contract/vo/VendorVo.java b/common/src/main/java/com/ecep/contract/vo/VendorVo.java index 8329367..ae30642 100644 --- a/common/src/main/java/com/ecep/contract/vo/VendorVo.java +++ b/common/src/main/java/com/ecep/contract/vo/VendorVo.java @@ -9,7 +9,7 @@ import com.ecep.contract.model.IdentityEntity; import lombok.Data; @Data -public class CompanyVendorVo implements IdentityEntity, CompanyBasedVo { +public class VendorVo implements IdentityEntity, CompanyBasedVo { private Integer id; private VendorType type; private boolean protocolProvider = false; diff --git a/server/src/main/java/com/ecep/contract/cloud/old/CompanyVendorFileUtils.java b/server/src/main/java/com/ecep/contract/cloud/old/CompanyVendorFileUtils.java index c4681bf..c9bb430 100644 --- a/server/src/main/java/com/ecep/contract/cloud/old/CompanyVendorFileUtils.java +++ b/server/src/main/java/com/ecep/contract/cloud/old/CompanyVendorFileUtils.java @@ -4,10 +4,10 @@ import java.time.LocalDate; import java.util.Map; import java.util.Objects; -import com.ecep.contract.model.CompanyVendorFile; +import com.ecep.contract.model.VendorFile; public class CompanyVendorFileUtils { - public static boolean applyVendorFileByMap(CompanyVendorFile vendorFile, Map m) { + public static boolean applyVendorFileByMap(VendorFile vendorFile, Map m) { boolean modified = false; String filePath = (String) m.get("FILE_PATH"); diff --git a/server/src/main/java/com/ecep/contract/cloud/old/OldVersionService.java b/server/src/main/java/com/ecep/contract/cloud/old/OldVersionService.java index 6c9573f..f162337 100644 --- a/server/src/main/java/com/ecep/contract/cloud/old/OldVersionService.java +++ b/server/src/main/java/com/ecep/contract/cloud/old/OldVersionService.java @@ -14,6 +14,7 @@ import java.util.function.Consumer; import java.util.function.Supplier; import java.util.stream.Stream; +import com.ecep.contract.ds.vendor.service.VendorService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; @@ -39,8 +40,7 @@ import com.ecep.contract.ds.contract.repository.ContractRepository; import com.ecep.contract.ds.customer.repository.CompanyCustomerFileRepository; import com.ecep.contract.ds.customer.repository.CompanyCustomerRepository; import com.ecep.contract.ds.other.service.SysConfService; -import com.ecep.contract.ds.vendor.repository.CompanyVendorRepository; -import com.ecep.contract.ds.vendor.service.CompanyVendorFileService; +import com.ecep.contract.ds.vendor.service.VendorFileService; import com.ecep.contract.model.CloudRk; import com.ecep.contract.model.CloudTyc; import com.ecep.contract.model.Company; @@ -51,7 +51,7 @@ import com.ecep.contract.model.CompanyCustomerFile; import com.ecep.contract.model.CompanyFile; import com.ecep.contract.model.CompanyOldName; import com.ecep.contract.model.Vendor; -import com.ecep.contract.model.CompanyVendorFile; +import com.ecep.contract.model.VendorFile; import com.ecep.contract.model.Contract; import com.ecep.contract.model.ContractFile; @@ -90,8 +90,6 @@ public class OldVersionService { @Autowired private CompanyCustomerRepository companyCustomerRepository; @Autowired - private CompanyVendorRepository companyVendorRepository; - @Autowired private CompanyOldNameRepository companyOldNameRepository; @Autowired private ContractRepository contractRepository; @@ -510,7 +508,8 @@ public class OldVersionService { if (type == Types.VENDOR) { String vendorType = (String) map.get("TYPE"); boolean changed = false; - Vendor vendor = companyVendorRepository.findByCompany(updater).orElse(null); + + Vendor vendor = SpringApp.getBean(VendorService.class).findByCompany(updater); if (vendor == null) { vendor = new Vendor(); vendor.setId(id); @@ -538,15 +537,15 @@ public class OldVersionService { } if (changed) { - companyVendorRepository.save(vendor); + SpringApp.getBean(VendorService.class).save(vendor); } - CompanyVendorFileService fileService = SpringApp.getBean(CompanyVendorFileService.class); + VendorFileService fileService = SpringApp.getBean(VendorFileService.class); // 1. 先做数据库排重 - List files = fileService.findAllByVendor(vendor); - HashMap fileMap = new HashMap<>(); - for (CompanyVendorFile vendorFile : files) { + List files = fileService.findAllByVendor(vendor); + HashMap fileMap = new HashMap<>(); + for (VendorFile vendorFile : files) { String key = vendorFile.getFilePath(); if (fileMap.containsKey(key)) { // 有重复，删除，按List顺序，只保留第一个 @@ -564,13 +563,13 @@ public class OldVersionService { List> rs = queryVendorEvalFormByVendorId(id); for (Map m : rs) { String key = CompanyVendorFileUtils.getVendorFileKey(m); - CompanyVendorFile vendorFile = fileMap.get(key); + VendorFile vendorFile = fileMap.get(key); if (vendorFile == null) { continue; } if (CompanyVendorFileUtils.applyVendorFileByMap(vendorFile, m)) { - CompanyVendorFile saved = fileService.save(vendorFile); + VendorFile saved = fileService.save(vendorFile); fileMap.put(key, saved); } } @@ -585,7 +584,7 @@ public class OldVersionService { continue; } try { - CompanyVendorFile vendorFile = new CompanyVendorFile(); + VendorFile vendorFile = new VendorFile(); CompanyVendorFileUtils.applyVendorFileByMap(vendorFile, m); vendorFile.setVendor(vendor); fileService.save(vendorFile); diff --git a/server/src/main/java/com/ecep/contract/cloud/old/OldVersionSyncVendorTask.java b/server/src/main/java/com/ecep/contract/cloud/old/OldVersionSyncVendorTask.java index caab57e..7c9cf63 100644 --- a/server/src/main/java/com/ecep/contract/cloud/old/OldVersionSyncVendorTask.java +++ b/server/src/main/java/com/ecep/contract/cloud/old/OldVersionSyncVendorTask.java @@ -8,7 +8,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; import java.util.stream.Stream; -import com.ecep.contract.ds.vendor.service.CompanyVendorService; +import com.ecep.contract.ds.vendor.service.VendorService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +35,7 @@ public class OldVersionSyncVendorTask extends Tasker { @Override protected Object execute(MessageHolder holder) throws Exception { - basePath = getCachedBean(CompanyVendorService.class).getBasePath(); + basePath = getCachedBean(VendorService.class).getBasePath(); List runnable = Arrays.asList(this::loadOldNames, this::loadContacts, this::syncVendors, this::syncContracts); for (int i = 0; i < runnable.size(); i++) { diff --git a/server/src/main/java/com/ecep/contract/cloud/u8/VendorSyncTask.java b/server/src/main/java/com/ecep/contract/cloud/u8/VendorSyncTask.java index 3336e7e..b1b5912 100644 --- a/server/src/main/java/com/ecep/contract/cloud/u8/VendorSyncTask.java +++ b/server/src/main/java/com/ecep/contract/cloud/u8/VendorSyncTask.java @@ -18,12 +18,12 @@ import com.ecep.contract.cloud.u8.ctx.VendorCtx; import com.ecep.contract.constant.CloudServiceConstant; import com.ecep.contract.ds.company.service.CompanyService; import com.ecep.contract.ds.contract.tasker.AbstContractRepairTasker; -import com.ecep.contract.ds.vendor.service.CompanyVendorEntityService; -import com.ecep.contract.ds.vendor.service.CompanyVendorService; +import com.ecep.contract.ds.vendor.service.VendorEntityService; +import com.ecep.contract.ds.vendor.service.VendorService; import com.ecep.contract.model.CloudYu; import com.ecep.contract.model.Company; import com.ecep.contract.model.Vendor; -import com.ecep.contract.model.CompanyVendorEntity; +import com.ecep.contract.model.VendorEntity; import lombok.Setter; @@ -33,8 +33,8 @@ import lombok.Setter; public class VendorSyncTask extends AbstContractRepairTasker { private static final Logger logger = LoggerFactory.getLogger(VendorSyncTask.class); private final VendorCtx vendorCtx = new VendorCtx(); - private CompanyVendorService companyVendorService; - private CompanyVendorEntityService vendorEntityService; + private VendorService vendorService; + private VendorEntityService vendorEntityService; private YongYouU8Repository repository; @Setter private YongYouU8Service yongYouU8Service; @@ -43,16 +43,16 @@ public class VendorSyncTask extends AbstContractRepairTasker { updateTitle("用友U8系统-同步供应商"); } - private CompanyVendorService getCompanyVendorService() { - if (companyVendorService == null) { - companyVendorService = SpringApp.getBean(CompanyVendorService.class); + private VendorService getVendorService() { + if (vendorService == null) { + vendorService = SpringApp.getBean(VendorService.class); } - return companyVendorService; + return vendorService; } - private CompanyVendorEntityService getVendorEntityService() { + private VendorEntityService getVendorEntityService() { if (vendorEntityService == null) { - vendorEntityService = SpringApp.getBean(CompanyVendorEntityService.class); + vendorEntityService = SpringApp.getBean(VendorEntityService.class); } return vendorEntityService; } @@ -82,7 +82,7 @@ public class VendorSyncTask extends AbstContractRepairTasker { String venCode = (String) rs.get("cVenCode"); MessageHolder subHolder = holder.sub(counter.get() + " / " + total + "> " + venCode + " "); boolean modified = false; - CompanyVendorEntity entity = vendorCtx.findOrCreateByCode(venCode, subHolder); + VendorEntity entity = vendorCtx.findOrCreateByCode(venCode, subHolder); Map map = repository.findVendorByVendCode(entity.getCode()); if (map == null) { subHolder.error("供应商项不存在：" + venCode); @@ -107,13 +107,13 @@ public class VendorSyncTask extends AbstContractRepairTasker { } } - private void updateCloudYu(CompanyVendorEntity entity) { + private void updateCloudYu(VendorEntity entity) { Vendor vendor = entity.getVendor(); if (vendor == null) { return; } if (!Hibernate.isInitialized(vendor)) { - vendor = getCompanyVendorService().findById(vendor.getId()); + vendor = getVendorService().findById(vendor.getId()); } Company company = vendor.getCompany(); if (company == null) { @@ -129,14 +129,14 @@ public class VendorSyncTask extends AbstContractRepairTasker { yongYouU8Service.save(cloudYu); } - private void updateCompanyNameAndAbbName(CompanyVendorEntity entity, MessageHolder holder) { + private void updateCompanyNameAndAbbName(VendorEntity entity, MessageHolder holder) { CompanyService companyService = vendorCtx.getCompanyService(); Vendor vendor = entity.getVendor(); if (vendor == null) { return; } if (!Hibernate.isInitialized(vendor)) { - vendor = getCompanyVendorService().findById(vendor.getId()); + vendor = getVendorService().findById(vendor.getId()); } Company company = vendor.getCompany(); if (company == null) { diff --git a/server/src/main/java/com/ecep/contract/cloud/u8/YongYouU8Service.java b/server/src/main/java/com/ecep/contract/cloud/u8/YongYouU8Service.java index 9dbb448..8b197d0 100644 --- a/server/src/main/java/com/ecep/contract/cloud/u8/YongYouU8Service.java +++ b/server/src/main/java/com/ecep/contract/cloud/u8/YongYouU8Service.java @@ -23,7 +23,7 @@ import com.ecep.contract.cloud.u8.ctx.AbstractYongYouU8Ctx; import com.ecep.contract.ds.company.service.CompanyService; import com.ecep.contract.ds.customer.service.CompanyCustomerService; import com.ecep.contract.ds.other.service.EmployeeService; -import com.ecep.contract.ds.vendor.service.CompanyVendorService; +import com.ecep.contract.ds.vendor.service.VendorService; import com.ecep.contract.model.CloudYu; import com.ecep.contract.model.Company; import com.fasterxml.jackson.databind.JsonNode; @@ -50,7 +50,7 @@ public class YongYouU8Service implements IEntityService, QueryService getter, Consumer setter, String code, @@ -139,9 +139,9 @@ public class AbstractYongYouU8Ctx extends AbstractCtx { MessageHolder holder, String topic) { Company company = null; if (StringUtils.hasText(vendorCode)) { - CompanyVendorEntityService vendorEntityService = getCompanyVendorEntityService(); - CompanyVendorService customerService = getCompanyVendorService(); - CompanyVendorEntity entity = vendorEntityService.findByCode(vendorCode); + VendorEntityService vendorEntityService = getCompanyVendorEntityService(); + VendorService customerService = getCompanyVendorService(); + VendorEntity entity = vendorEntityService.findByCode(vendorCode); if (entity == null) { holder.warn("无效" + topic + "：" + vendorCode); } else { diff --git a/server/src/main/java/com/ecep/contract/cloud/u8/ctx/ContractCtx.java b/server/src/main/java/com/ecep/contract/cloud/u8/ctx/ContractCtx.java index 22f5135..476550d 100644 --- a/server/src/main/java/com/ecep/contract/cloud/u8/ctx/ContractCtx.java +++ b/server/src/main/java/com/ecep/contract/cloud/u8/ctx/ContractCtx.java @@ -32,13 +32,13 @@ import com.ecep.contract.ds.customer.service.CompanyCustomerEntityService; import com.ecep.contract.ds.customer.service.CompanyCustomerService; import com.ecep.contract.ds.project.ProjectCtx; import com.ecep.contract.ds.project.service.ProjectSaleTypeService; -import com.ecep.contract.ds.vendor.service.CompanyVendorEntityService; -import com.ecep.contract.ds.vendor.service.CompanyVendorService; +import com.ecep.contract.ds.vendor.service.VendorEntityService; +import com.ecep.contract.ds.vendor.service.VendorService; import com.ecep.contract.model.Company; import com.ecep.contract.model.CompanyCustomer; import com.ecep.contract.model.CompanyCustomerEntity; import com.ecep.contract.model.Vendor; -import com.ecep.contract.model.CompanyVendorEntity; +import com.ecep.contract.model.VendorEntity; import com.ecep.contract.model.Contract; import com.ecep.contract.model.ContractCatalog; import com.ecep.contract.model.ContractFile; @@ -334,11 +334,11 @@ public class ContractCtx extends AbstractYongYouU8Ctx { Company company = contract.getCompany(); boolean modified = false; boolean vendorModified = false; - CompanyVendorService vendorService = getCompanyVendorService(); - CompanyVendorEntityService vendorEntityService = getCompanyVendorEntityService(); - CompanyVendorEntity entity = vendorEntityService.findByCode(unit); + VendorService vendorService = getCompanyVendorService(); + VendorEntityService vendorEntityService = getCompanyVendorEntityService(); + VendorEntity entity = vendorEntityService.findByCode(unit); if (entity == null) { - entity = new CompanyVendorEntity(); + entity = new VendorEntity(); entity.setCode(unit); } entity = updateVendorEntityDetailByCode(entity, unit, holder); @@ -407,8 +407,8 @@ public class ContractCtx extends AbstractYongYouU8Ctx { return true; } - private CompanyVendorEntity updateVendorEntityDetailByCode(CompanyVendorEntity entity, String unitCode, - MessageHolder holder) { + private VendorEntity updateVendorEntityDetailByCode(VendorEntity entity, String unitCode, + MessageHolder holder) { if (vendorEntityUpdateDelayDays > 0) { LocalDateTime today = LocalDateTime.now(); if (entity.getFetchedTime() != null) { @@ -574,7 +574,7 @@ public class ContractCtx extends AbstractYongYouU8Ctx { return getContractService().findByCode(contractCode); } - public boolean syncByVendorEntity(Vendor vendor, CompanyVendorEntity entity, MessageHolder holder) { + public boolean syncByVendorEntity(Vendor vendor, VendorEntity entity, MessageHolder holder) { String code = entity.getCode(); holder.debug("同步供应商相关项 " + code + "," + entity.getName() + " 的合同"); if (!StringUtils.hasText(code)) { diff --git a/server/src/main/java/com/ecep/contract/cloud/u8/ctx/PurchaseBillVoucherCtx.java b/server/src/main/java/com/ecep/contract/cloud/u8/ctx/PurchaseBillVoucherCtx.java index 5506abd..b04a5c7 100644 --- a/server/src/main/java/com/ecep/contract/cloud/u8/ctx/PurchaseBillVoucherCtx.java +++ b/server/src/main/java/com/ecep/contract/cloud/u8/ctx/PurchaseBillVoucherCtx.java @@ -22,7 +22,7 @@ import com.ecep.contract.ds.contract.service.PurchaseOrderItemService; import com.ecep.contract.ds.contract.service.PurchaseOrdersService; import com.ecep.contract.model.Company; import com.ecep.contract.model.Vendor; -import com.ecep.contract.model.CompanyVendorEntity; +import com.ecep.contract.model.VendorEntity; import com.ecep.contract.model.Contract; import com.ecep.contract.model.Inventory; import com.ecep.contract.model.Invoice; @@ -111,10 +111,10 @@ public class PurchaseBillVoucherCtx extends AbstractYongYouU8Ctx { Vendor vendor = getCompanyVendorService().findByCompany(company); if (vendor != null) { - List entities = getCompanyVendorEntityService().findAllByVendor(vendor); + List entities = getCompanyVendorEntityService().findAllByVendor(vendor); holder.debug(company.getName() + " 有 " - + entities.stream().map(CompanyVendorEntity::getCode).collect(Collectors.joining(", ")) + " 关联项"); - for (CompanyVendorEntity entity : entities) { + + entities.stream().map(VendorEntity::getCode).collect(Collectors.joining(", ")) + " 关联项"); + for (VendorEntity entity : entities) { // 查询 U8 数据库 List> ds = repository.findAllPurchaseBillVoucherByVendorCode(entity.getCode()); holder.debug( diff --git a/server/src/main/java/com/ecep/contract/cloud/u8/ctx/VendorCtx.java b/server/src/main/java/com/ecep/contract/cloud/u8/ctx/VendorCtx.java index bf3cf2f..a3cca1c 100644 --- a/server/src/main/java/com/ecep/contract/cloud/u8/ctx/VendorCtx.java +++ b/server/src/main/java/com/ecep/contract/cloud/u8/ctx/VendorCtx.java @@ -15,11 +15,11 @@ import com.ecep.contract.MessageHolder; import com.ecep.contract.SpringApp; import com.ecep.contract.cloud.old.OldVersionService; import com.ecep.contract.ds.company.service.CompanyService; -import com.ecep.contract.ds.vendor.service.CompanyVendorEntityService; -import com.ecep.contract.ds.vendor.service.CompanyVendorService; +import com.ecep.contract.ds.vendor.service.VendorEntityService; +import com.ecep.contract.ds.vendor.service.VendorService; import com.ecep.contract.model.Company; import com.ecep.contract.model.Vendor; -import com.ecep.contract.model.CompanyVendorEntity; +import com.ecep.contract.model.VendorEntity; import com.ecep.contract.model.VendorCatalog; import lombok.Setter; @@ -27,7 +27,7 @@ import lombok.Setter; public class VendorCtx extends AbstractYongYouU8Ctx { private static final String AUTO_CREATE_VENDOR_AFTER = "cloud.u8.auto-create-vendor-after"; @Setter - private CompanyVendorService companyVendorService; + private VendorService vendorService; @Setter private CompanyCtx companyCtx; @Setter @@ -66,14 +66,14 @@ public class VendorCtx extends AbstractYongYouU8Ctx { * @param unitCode 供应商相关项编码 * @param holder 消息 */ - public CompanyVendorEntity updateVendorEntityDetailByCode(CompanyVendorEntity item, String unitCode, MessageHolder holder) { + public VendorEntity updateVendorEntityDetailByCode(VendorEntity item, String unitCode, MessageHolder holder) { if (applyEntityDetail(item, repository.findVendorByVendCode(unitCode), holder)) { item = save(item); } return item; } - public boolean applyEntityDetail(CompanyVendorEntity item, Map map, MessageHolder holder) { + public boolean applyEntityDetail(VendorEntity item, Map map, MessageHolder holder) { if (map == null || map.isEmpty()) { holder.warn("Vendor 中未检索到供应商数据"); return false; @@ -199,7 +199,7 @@ public class VendorCtx extends AbstractYongYouU8Ctx { } // 检索相关项 - List entities = getCompanyVendorEntityService().findAllByVendor(vendor); + List entities = getCompanyVendorEntityService().findAllByVendor(vendor); if (entities.isEmpty()) { holder.error("供应商关联任何相关项"); return false; @@ -209,7 +209,7 @@ public class VendorCtx extends AbstractYongYouU8Ctx { boolean companyModified = false; // 更新相关项 - for (CompanyVendorEntity entity : entities) { + for (VendorEntity entity : entities) { if (!StringUtils.hasText(entity.getCode())) { holder.warn("相关项：" + entity.getCode() + " 无效，跳过"); continue; @@ -234,7 +234,7 @@ public class VendorCtx extends AbstractYongYouU8Ctx { } // 同步供应商关联的合同 - for (CompanyVendorEntity entity : entities) { + for (VendorEntity entity : entities) { if (getContractCtx().syncByVendorEntity(vendor, entity, holder)) { updated = true; } @@ -242,7 +242,7 @@ public class VendorCtx extends AbstractYongYouU8Ctx { return updated; } - private boolean updateCompanyNameAndAbbNameByVendorEntity(Company company, CompanyVendorEntity entity, MessageHolder holder) { + private boolean updateCompanyNameAndAbbNameByVendorEntity(Company company, VendorEntity entity, MessageHolder holder) { CompanyService companyService = getCompanyService(); if (company == null) { return false; @@ -261,9 +261,9 @@ public class VendorCtx extends AbstractYongYouU8Ctx { return modified; } - private boolean updateVendorDevelopDate(Vendor vendor, List entities, MessageHolder holder) { + private boolean updateVendorDevelopDate(Vendor vendor, List entities, MessageHolder holder) { LocalDate developDate = null; - for (CompanyVendorEntity entity : entities) { + for (VendorEntity entity : entities) { // 取最早的开发日期 if (developDate == null || entity.getDevelopDate().isBefore(developDate)) { developDate = entity.getDevelopDate(); @@ -272,11 +272,11 @@ public class VendorCtx extends AbstractYongYouU8Ctx { return updateLocalDate(vendor::getDevelopDate, vendor::setDevelopDate, developDate, holder, "开发日期"); } - public CompanyVendorEntity findOrCreateByCode(String venCode, MessageHolder subHolder) { - CompanyVendorEntityService service = getCompanyVendorEntityService(); - CompanyVendorEntity entity = service.findByCode(venCode); + public VendorEntity findOrCreateByCode(String venCode, MessageHolder subHolder) { + VendorEntityService service = getCompanyVendorEntityService(); + VendorEntity entity = service.findByCode(venCode); if (entity == null) { - entity = new CompanyVendorEntity(); + entity = new VendorEntity(); entity.setCode(venCode); entity = service.save(entity); subHolder.info("创建供应商相关项: " + venCode); @@ -284,7 +284,7 @@ public class VendorCtx extends AbstractYongYouU8Ctx { return entity; } - private Vendor createVendorByVendorEntity(CompanyVendorEntity entity, MessageHolder holder) { + private Vendor createVendorByVendorEntity(VendorEntity entity, MessageHolder holder) { LocalDate developDate = entity.getDevelopDate(); if (developDate == null) { holder.warn(entity.getName() + " 没有设置开发日期，跳过"); @@ -313,13 +313,13 @@ public class VendorCtx extends AbstractYongYouU8Ctx { } - private Company findOrCreateCompanyByVendorEntity(CompanyVendorEntity entity, MessageHolder holder) { + private Company findOrCreateCompanyByVendorEntity(VendorEntity entity, MessageHolder holder) { String name = entity.getName(); String abbName = entity.getAbbName(); return getCompanyCtx().findOrCreateByNameOrAbbName(name, abbName, entity.getDevelopDate(), holder); } - public CompanyVendorEntity save(CompanyVendorEntity entity) { + public VendorEntity save(VendorEntity entity) { return getCompanyVendorEntityService().save(entity); } diff --git a/server/src/main/java/com/ecep/contract/ds/company/service/CompanyBasicService.java b/server/src/main/java/com/ecep/contract/ds/company/service/CompanyBasicService.java index df7996c..2b80972 100644 --- a/server/src/main/java/com/ecep/contract/ds/company/service/CompanyBasicService.java +++ b/server/src/main/java/com/ecep/contract/ds/company/service/CompanyBasicService.java @@ -25,7 +25,7 @@ import com.ecep.contract.ds.other.repository.HolidayTableRepository; import com.ecep.contract.model.Company; import com.ecep.contract.model.CompanyBasicFile; import com.ecep.contract.model.CompanyCustomerFile; -import com.ecep.contract.model.CompanyVendorFile; +import com.ecep.contract.model.VendorFile; import com.ecep.contract.model.HolidayTable; public abstract class CompanyBasicService { @@ -161,7 +161,7 @@ public abstract class CompanyBasicService { * @param 类型类 * @param 文件类 * @return 是否修改了 - * @see CompanyVendorFile + * @see VendorFile * @see VendorFileType * @see CompanyCustomerFile * @see CustomerFileType diff --git a/server/src/main/java/com/ecep/contract/ds/company/service/CompanyService.java b/server/src/main/java/com/ecep/contract/ds/company/service/CompanyService.java index cdc9ec8..a168178 100644 --- a/server/src/main/java/com/ecep/contract/ds/company/service/CompanyService.java +++ b/server/src/main/java/com/ecep/contract/ds/company/service/CompanyService.java @@ -12,7 +12,7 @@ import com.ecep.contract.ds.company.repository.CompanyRepository; import com.ecep.contract.ds.contract.service.ContractService; import com.ecep.contract.ds.customer.service.CompanyCustomerService; import com.ecep.contract.ds.other.service.SysConfService; -import com.ecep.contract.ds.vendor.service.CompanyVendorService; +import com.ecep.contract.ds.vendor.service.VendorService; import com.ecep.contract.model.Company; import com.ecep.contract.model.CompanyCustomer; import com.ecep.contract.model.CompanyOldName; @@ -63,7 +63,7 @@ public class CompanyService extends EntityService implements I private ContractService contractService; @Lazy @Autowired - private CompanyVendorService companyVendorService; + private VendorService vendorService; @Lazy @Autowired private CompanyCustomerService companyCustomerService; @@ -254,7 +254,7 @@ public class CompanyService extends EntityService implements I *

* 删除前需要把关联数据解除 *

    - *
  • {@link CompanyVendorService#deleteByCompany(Company)}
    • + *
  • {@link VendorService#deleteByCompany(Company)}
    • *
  • {@link CompanyCustomerService#deleteByCompany(Company)}
    • *
  • {@link CompanyOldNameService#deleteByCompany(Company)}
    • *
  • {@link CompanyContactService#deleteByCompany(Company)}
    • @@ -263,7 +263,7 @@ public class CompanyService extends EntityService implements I *
* 或者 把关联数据转移到其他公司 *
    - *
  • {@link CompanyVendorService#resetTo(Company, Company)}
    • + *
  • {@link VendorService#resetTo(Company, Company)}
    • *
  • {@link CompanyCustomerService#resetTo(Company, Company)}
    • *
  • {@link CompanyOldNameService#resetTo(Company, Company)}
    • *
  • {@link CompanyContactService#resetTo(Company, Company)}
    • @@ -286,7 +286,7 @@ public class CompanyService extends EntityService implements I companyOldNameService.deleteByCompany(company); companyContactService.deleteByCompany(company); // 供应商和客户 - companyVendorService.deleteByCompany(company); + vendorService.deleteByCompany(company); companyCustomerService.deleteByCompany(company); contractService.deleteByCompany(company); @@ -320,7 +320,7 @@ public class CompanyService extends EntityService implements I companyOldNameService.resetTo(from, to); companyContactService.resetTo(from, to); // 供应商和客户 - companyVendorService.resetTo(from, to); + vendorService.resetTo(from, to); companyCustomerService.resetTo(from, to); contractService.resetTo(from, to); @@ -465,7 +465,7 @@ public class CompanyService extends EntityService implements I }); } - List searchedVendors = companyVendorService.search(searchText); + List searchedVendors = vendorService.search(searchText); if (!searchedVendors.isEmpty()) { spec = SpecificationUtils.or(spec, (root, query, builder) -> { return builder.in(root.get("id")).value(searchedVendors.stream() diff --git a/server/src/main/java/com/ecep/contract/ds/contract/tasker/ContractVerifyComm.java b/server/src/main/java/com/ecep/contract/ds/contract/tasker/ContractVerifyComm.java index 47aa892..d6eba0a 100644 --- a/server/src/main/java/com/ecep/contract/ds/contract/tasker/ContractVerifyComm.java +++ b/server/src/main/java/com/ecep/contract/ds/contract/tasker/ContractVerifyComm.java @@ -44,7 +44,7 @@ import com.ecep.contract.ds.project.service.ProjectQuotationService; import com.ecep.contract.ds.project.service.ProjectSaleTypeRequireFileTypeService; import com.ecep.contract.ds.project.service.ProjectService; import com.ecep.contract.ds.project.service.ProjectSaleTypeService; -import com.ecep.contract.ds.vendor.service.CompanyVendorService; +import com.ecep.contract.ds.vendor.service.VendorService; import com.ecep.contract.ds.vendor.service.VendorGroupRequireFileTypeService; import com.ecep.contract.ds.vendor.service.VendorGroupService; import com.ecep.contract.model.Company; @@ -88,7 +88,7 @@ public class ContractVerifyComm { private CompanyService companyService; private CompanyFileService companyFileService; // Vendor - private CompanyVendorService companyVendorService; + private VendorService vendorService; private VendorGroupService vendorGroupService; private VendorGroupRequireFileTypeService vendorGroupRequireFileTypeService; private ExtendVendorInfoService extendVendorInfoService; @@ -204,11 +204,11 @@ public class ContractVerifyComm { return extendVendorInfoService; } - private CompanyVendorService getCompanyVendorService() { - if (companyVendorService == null) { - companyVendorService = SpringApp.getBean(CompanyVendorService.class); + private VendorService getVendorService() { + if (vendorService == null) { + vendorService = SpringApp.getBean(VendorService.class); } - return companyVendorService; + return vendorService; } private CompanyCustomerService getCompanyCustomerService() { @@ -431,7 +431,7 @@ public class ContractVerifyComm { } } if (verifyVendor) { - getCompanyVendorService().verify(contract, holder); + getVendorService().verify(contract, holder); } if (verifyVendorFiles) { diff --git a/server/src/main/java/com/ecep/contract/ds/customer/service/CompanyCustomerService.java b/server/src/main/java/com/ecep/contract/ds/customer/service/CompanyCustomerService.java index 5eec906..0d91ae3 100644 --- a/server/src/main/java/com/ecep/contract/ds/customer/service/CompanyCustomerService.java +++ b/server/src/main/java/com/ecep/contract/ds/customer/service/CompanyCustomerService.java @@ -181,6 +181,7 @@ public class CompanyCustomerService extends CompanyBasicService return modified; } + @SuppressWarnings("unchecked") @Override protected > boolean fillFileAsDefaultType(F dbFile, File file, Consumer status) { @@ -249,7 +250,7 @@ public class CompanyCustomerService extends CompanyBasicService logger.info("delete json file {}", jsonFile.getName()); } } - + @SuppressWarnings("unchecked") @Override protected > F fillFileType(File file, List fileList, Consumer status) { @@ -260,7 +261,7 @@ public class CompanyCustomerService extends CompanyBasicService } return null; } - + @SuppressWarnings("unchecked") @Override protected > boolean setFileTypeAsEvaluationForm(F file) { T type = file.getType(); 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 index 648804d..9c6a2d6 100644 --- 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 @@ -8,7 +8,7 @@ import com.ecep.contract.ds.MyRepository; import com.ecep.contract.model.VendorApprovedFile; @Repository -public interface CompanyVendorApprovedFileRepository extends MyRepository { +public interface VendorApprovedFileRepository extends MyRepository { List findAllByListId(int listId); 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 index 52a689f..b0f213d 100644 --- 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 @@ -14,7 +14,7 @@ import com.ecep.contract.model.VendorApproved; * 合格供方名录 */ @Repository -public interface CompanyVendorApprovedItemRepository extends +public interface VendorApprovedItemRepository extends JpaRepository, JpaSpecificationExecutor { List findAllByList(VendorApproved list); diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorApprovedRepository.java b/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorApprovedRepository.java index e92fdf8..9271a60 100644 --- a/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorApprovedRepository.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorApprovedRepository.java @@ -10,7 +10,7 @@ import com.ecep.contract.model.VendorApproved; * 合格供方名录 */ @Repository -public interface CompanyVendorApprovedListRepository extends +public interface VendorApprovedRepository extends JpaRepository, JpaSpecificationExecutor diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorEntityRepository.java b/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorEntityRepository.java index 6806a11..b908660 100644 --- a/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorEntityRepository.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorEntityRepository.java @@ -10,7 +10,7 @@ import com.ecep.contract.model.Vendor; import com.ecep.contract.model.VendorEntity; @Repository -public interface CompanyVendorEntityRepository extends MyRepository { +public interface VendorEntityRepository extends MyRepository { Optional findByCode(String code); List findByVendor(Vendor vendor); diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorFileRepository.java b/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorFileRepository.java index b7b9a54..55bc817 100644 --- a/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorFileRepository.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorFileRepository.java @@ -11,7 +11,7 @@ import com.ecep.contract.model.Vendor; import com.ecep.contract.model.VendorFile; @Repository -public interface CompanyVendorFileRepository +public interface VendorFileRepository extends JpaRepository, JpaSpecificationExecutor { List findAllByVendorId(int vendorId); diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorRepository.java b/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorRepository.java index 1bdc3dd..ad97a2b 100644 --- a/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorRepository.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/repository/VendorRepository.java @@ -16,7 +16,7 @@ import com.ecep.contract.model.VendorCatalog; * 供应商 Repository */ @Repository -public interface CompanyVendorRepository extends MyRepository { +public interface VendorRepository extends MyRepository { List findAllByCatalog(VendorCatalog catalog); diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedFileService.java b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedFileService.java index 7faa715..93fd11e 100644 --- a/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedFileService.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedFileService.java @@ -10,16 +10,16 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; import com.ecep.contract.IEntityService; -import com.ecep.contract.ds.vendor.repository.CompanyVendorApprovedFileRepository; +import com.ecep.contract.ds.vendor.repository.VendorApprovedFileRepository; import com.ecep.contract.model.VendorApprovedFile; import com.ecep.contract.model.VendorApproved; @Lazy @Service -public class CompanyVendorApprovedFileService implements IEntityService { +public class VendorApprovedFileService implements IEntityService { @Lazy @Autowired - private CompanyVendorApprovedFileRepository repository; + private VendorApprovedFileRepository repository; /** * 根据ID查找供应商已批准文件 diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedItemService.java b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedItemService.java index d625854..f387233 100644 --- a/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedItemService.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedItemService.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Service; import com.ecep.contract.IEntityService; import com.ecep.contract.ds.company.service.CompanyOldNameService; -import com.ecep.contract.ds.vendor.repository.CompanyVendorApprovedItemRepository; +import com.ecep.contract.ds.vendor.repository.VendorApprovedItemRepository; import com.ecep.contract.model.Company; import com.ecep.contract.model.CompanyOldName; import com.ecep.contract.model.Vendor; @@ -28,10 +28,10 @@ import jakarta.persistence.criteria.Predicate; @Lazy @Service -public class CompanyVendorApprovedItemService implements IEntityService, QueryService { +public class VendorApprovedItemService implements IEntityService, QueryService { @Lazy @Autowired - private CompanyVendorApprovedItemRepository repository; + private VendorApprovedItemRepository repository; @Lazy @Autowired private CompanyOldNameService companyOldNameService; diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedService.java b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedService.java index e7ebee6..f6b3bf6 100644 --- a/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedService.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorApprovedService.java @@ -6,7 +6,7 @@ import com.ecep.contract.MyDateTimeUtils; 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.ds.vendor.repository.VendorApprovedRepository; import com.ecep.contract.model.VendorApprovedFile; import com.ecep.contract.model.VendorApproved; import com.ecep.contract.util.FileUtils; @@ -33,17 +33,17 @@ import java.util.function.Consumer; @Lazy @Service -public class CompanyVendorApprovedListService implements IEntityService, QueryService { - private static final Logger logger = LoggerFactory.getLogger(CompanyVendorApprovedListService.class); +public class VendorApprovedService implements IEntityService, QueryService { + private static final Logger logger = LoggerFactory.getLogger(VendorApprovedService.class); @Lazy @Autowired - private CompanyVendorApprovedListRepository repository; + private VendorApprovedRepository repository; @Lazy @Autowired - private CompanyVendorApprovedItemService itemService; + private VendorApprovedItemService itemService; @Lazy @Autowired - private CompanyVendorApprovedFileService fileService; + private VendorApprovedFileService fileService; @Lazy @Autowired diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorEntityService.java b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorEntityService.java index 760155b..5843214 100644 --- a/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorEntityService.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorEntityService.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import com.ecep.contract.IEntityService; -import com.ecep.contract.ds.vendor.repository.CompanyVendorEntityRepository; +import com.ecep.contract.ds.vendor.repository.VendorEntityRepository; import com.ecep.contract.model.Vendor; import com.ecep.contract.model.VendorEntity; import com.ecep.contract.util.SpecificationUtils; @@ -25,10 +25,10 @@ import com.fasterxml.jackson.databind.JsonNode; @Lazy @Service @CacheConfig(cacheNames = "company-vendor-entity") -public class CompanyVendorEntityService implements IEntityService, QueryService { +public class VendorEntityService implements IEntityService, QueryService { @Lazy @Autowired - private CompanyVendorEntityRepository repository; + private VendorEntityRepository repository; @Cacheable(key = "#p0") @Override diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorFileService.java b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorFileService.java index a0f651d..d0c7c11 100644 --- a/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorFileService.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorFileService.java @@ -22,7 +22,7 @@ import org.springframework.stereotype.Service; import com.ecep.contract.ds.company.service.CompanyBasicService; 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.ds.vendor.repository.VendorFileRepository; import com.ecep.contract.model.Vendor; import com.ecep.contract.model.VendorFile; import com.ecep.contract.model.Contract; @@ -30,13 +30,13 @@ import com.ecep.contract.model.Contract; @Lazy @Service -public class CompanyVendorFileService implements IEntityService, QueryService { +public class VendorFileService implements IEntityService, QueryService { - private static final Logger logger = LoggerFactory.getLogger(CompanyVendorFileService.class); + private static final Logger logger = LoggerFactory.getLogger(VendorFileService.class); @Autowired - private CompanyVendorFileRepository repository; + private VendorFileRepository repository; @Autowired private ContractFileService contractFileService; diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorGroupRequireFileTypeService.java b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorGroupRequireFileTypeService.java index 9c6fff1..aea3486 100644 --- a/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorGroupRequireFileTypeService.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorGroupRequireFileTypeService.java @@ -4,8 +4,6 @@ import java.util.List; import com.ecep.contract.IEntityService; import com.ecep.contract.QueryService; -import com.ecep.contract.model.CompanyVendorFile; -import com.ecep.contract.util.SpecificationUtils; import com.fasterxml.jackson.databind.JsonNode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheConfig; diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorService.java b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorService.java index 211da8f..ded1d9e 100644 --- a/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorService.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/service/VendorService.java @@ -5,7 +5,7 @@ import com.ecep.contract.constant.CompanyVendorConstant; import com.ecep.contract.constant.ServiceConstant; import com.ecep.contract.ds.company.service.CompanyBasicService; import com.ecep.contract.ds.other.service.SysConfService; -import com.ecep.contract.ds.vendor.repository.CompanyVendorRepository; +import com.ecep.contract.ds.vendor.repository.VendorRepository; import com.ecep.contract.ds.vendor.repository.VendorClassRepository; import com.ecep.contract.ds.vendor.repository.VendorTypeLocalRepository; import com.ecep.contract.model.*; @@ -39,23 +39,23 @@ import java.util.stream.Collectors; @Lazy @Service @CacheConfig(cacheNames = CompanyVendorConstant.CACHE_NAME) -public class CompanyVendorService extends CompanyBasicService +public class VendorService extends CompanyBasicService implements IEntityService, QueryService { - private static final Logger logger = LoggerFactory.getLogger(CompanyVendorService.class); + private static final Logger logger = LoggerFactory.getLogger(VendorService.class); @Lazy @Autowired - private CompanyVendorRepository companyVendorRepository; + private VendorRepository repository; @Lazy @Autowired - private CompanyVendorFileService companyVendorFileService; + private VendorFileService vendorFileService; @Lazy @Autowired private SysConfService confService; @Lazy @Autowired - private CompanyVendorEntityService companyVendorEntityService; + private VendorEntityService vendorEntityService; @Lazy @Autowired private VendorTypeLocalRepository vendorTypeLocalRepository; @@ -64,11 +64,11 @@ public class CompanyVendorService extends CompanyBasicService @Cacheable(key = "#p0") public Vendor findById(Integer id) { - return companyVendorRepository.findById(id).orElse(null); + return repository.findById(id).orElse(null); } public Page findAll(Specification spec, Pageable pageable) { - return companyVendorRepository.findAll(spec, pageable); + return repository.findAll(spec, pageable); } @Override @@ -87,14 +87,14 @@ public class CompanyVendorService extends CompanyBasicService } public Vendor findByCompany(Company company) { - return companyVendorRepository.findByCompany(company).orElse(null); + return repository.findByCompany(company).orElse(null); } @Caching(evict = { @CacheEvict(key = "#p0.id") }) public Vendor save(Vendor vendor) { - return companyVendorRepository.save(vendor); + return repository.save(vendor); } @Caching(evict = { @@ -102,7 +102,7 @@ public class CompanyVendorService extends CompanyBasicService }) @Override public void delete(Vendor entity) { - companyVendorRepository.delete(entity); + repository.delete(entity); } @Override @@ -125,7 +125,7 @@ public class CompanyVendorService extends CompanyBasicService } catch (Exception ignored) { } } - List searched = companyVendorEntityService.search(searchText); + List searched = vendorEntityService.search(searchText); if (!searched.isEmpty()) { nameSpec = SpecificationUtils.or(nameSpec, (root, query, builder) -> { return builder.in(root.get("id")).value(searched.stream() @@ -141,12 +141,12 @@ public class CompanyVendorService extends CompanyBasicService @Override public List search(String searchText) { Specification spec = getSpecification(searchText); - return companyVendorRepository.findAll(spec, Pageable.ofSize(10)).getContent(); + return repository.findAll(spec, Pageable.ofSize(10)).getContent(); } @Override public , ID> void deleteFile(F file) { - companyVendorFileService.delete((VendorFile) file); + vendorFileService.delete((VendorFile) file); } public File getBasePath() { @@ -160,7 +160,7 @@ public class CompanyVendorService extends CompanyBasicService * @param status 输出 */ public boolean reBuildingFiles(Vendor vendor, Consumer status) { - List dbFiles = companyVendorFileService.findAllByVendor(vendor); + List dbFiles = vendorFileService.findAllByVendor(vendor); Map map = new HashMap<>(); boolean modified = fetchDbFiles(dbFiles, map, status); @@ -180,7 +180,7 @@ public class CompanyVendorService extends CompanyBasicService if (!retrieveFiles.isEmpty()) { // update db retrieveFiles.forEach(v -> v.setVendor(vendor)); - companyVendorFileService.saveAll(retrieveFiles); + vendorFileService.saveAll(retrieveFiles); modified = true; } @@ -193,7 +193,7 @@ public class CompanyVendorService extends CompanyBasicService Consumer status) { dbFile.setType((T) VendorFileType.General); fillFile(dbFile, file, null, status); - companyVendorFileService.save((VendorFile) dbFile); + vendorFileService.save((VendorFile) dbFile); return true; } @@ -336,10 +336,10 @@ public class CompanyVendorService extends CompanyBasicService holder.error("未设置文件夹"); } - companyVendorFileService.verify(vendor, verifyDate, holder); + vendorFileService.verify(vendor, verifyDate, holder); if (modified) { - companyVendorRepository.save(vendor); + repository.save(vendor); } return modified; } @@ -401,17 +401,17 @@ public class CompanyVendorService extends CompanyBasicService } public void resetTo(Company from, Company to) { - Optional optional = companyVendorRepository.findByCompany(from); + Optional optional = repository.findByCompany(from); optional.ifPresent(companyVendor -> { companyVendor .setDescription(MyStringUtils.appendIfAbsent(companyVendor.getDescription(), "转自 " + from.getId())); companyVendor.setCompany(to); - companyVendorRepository.save(companyVendor); + repository.save(companyVendor); }); } public void deleteByCompany(Company company) { - int deleted = companyVendorRepository.deleteAllByCompany(company); + int deleted = repository.deleteAllByCompany(company); if (deleted > 0) { if (logger.isInfoEnabled()) { logger.info("Delete {} records by company:#{}", deleted, company.getId()); @@ -449,7 +449,7 @@ public class CompanyVendorService extends CompanyBasicService } public long count(Specification spec) { - return companyVendorRepository.count(spec); + return repository.count(spec); } } diff --git a/server/src/main/java/com/ecep/contract/ds/vendor/task/VendorVerifyAllTasker.java b/server/src/main/java/com/ecep/contract/ds/vendor/task/VendorVerifyAllTasker.java index a45f518..3446cd4 100644 --- a/server/src/main/java/com/ecep/contract/ds/vendor/task/VendorVerifyAllTasker.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/task/VendorVerifyAllTasker.java @@ -15,7 +15,7 @@ import org.springframework.util.StringUtils; import com.ecep.contract.MessageHolder; import com.ecep.contract.ds.contract.tasker.ContractRepairComm; -import com.ecep.contract.ds.vendor.service.CompanyVendorService; +import com.ecep.contract.ds.vendor.service.VendorService; import com.ecep.contract.model.Vendor; import com.ecep.contract.ui.Tasker; @@ -33,7 +33,7 @@ public class VendorVerifyAllTasker extends Tasker { AtomicInteger counter = new AtomicInteger(0); Specification spec = null; - CompanyVendorService vendorService = getBean(CompanyVendorService.class); + VendorService vendorService = getBean(VendorService.class); long total = vendorService.count(spec); while (true) { if (isCancelled()) {