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

refactor(vendor): 重构供应商相关类命名和包结构

Browse Source 
将CompanyVendor前缀的类重命名为Vendor前缀，优化包结构
调整供应商相关控制器、服务、仓库类的命名和位置
修复TableViewUtils中的类型安全警告
更新FXML文件中的控制器引用路径
This commit is contained in:
宋其青
2025-09-23 23:37:44 +08:00
parent 9c3306eea3
commit 9561ad99e6
124 changed files with 613 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/main/java/com/ecep/contract/task/ContractGroupSyncTask.java
View File

@@ -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 ContractGroupSyncTask extends Tasker<Object>{
@Override

3
client/src/main/java/com/ecep/contract/task/ContractKindSyncTask.java
View File

@@ -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<Object> {
@Override

3
client/src/main/java/com/ecep/contract/task/ContractSyncAllTask.java
View File

@@ -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<Object> {
@Override

3
client/src/main/java/com/ecep/contract/task/ContractTypeSyncTask.java
View File

@@ -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<Object> {
@Override

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

@@ -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()) {

3
client/src/main/java/com/ecep/contract/task/CustomerClassSyncTask.java
View File

@@ -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<Object> {

3
client/src/main/java/com/ecep/contract/task/VendorClassSyncTask.java
View File

@@ -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<Object> {
@Override