diff --git a/client/src/main/java/com/ecep/contract/controller/ComboBoxUtils.java b/client/src/main/java/com/ecep/contract/controller/ComboBoxUtils.java index 5debacf..948e13c 100644 --- a/client/src/main/java/com/ecep/contract/controller/ComboBoxUtils.java +++ b/client/src/main/java/com/ecep/contract/controller/ComboBoxUtils.java @@ -116,7 +116,7 @@ public class ComboBoxUtils { } } - public static void initialComboBox( + public static void initialComboBox( ComboBox comboBox, Property property, IEntityService queryService, boolean hasNull) { ObservableList list = FXCollections.observableArrayList(); if (hasNull) { diff --git a/client/src/main/java/com/ecep/contract/controller/customer/CompanyCustomerEvaluationFormUpdateTask.java b/client/src/main/java/com/ecep/contract/controller/customer/CompanyCustomerEvaluationFormUpdateTask.java index 64273f8..038167e 100644 --- a/client/src/main/java/com/ecep/contract/controller/customer/CompanyCustomerEvaluationFormUpdateTask.java +++ b/client/src/main/java/com/ecep/contract/controller/customer/CompanyCustomerEvaluationFormUpdateTask.java @@ -26,7 +26,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.util.StringUtils; -import com.ecep.contract.CompanyCustomerFileType; +import com.ecep.contract.CustomerFileType; import com.ecep.contract.MessageHolder; import com.ecep.contract.SpringApp; import com.ecep.contract.vo.CloudTycVo; @@ -127,7 +127,7 @@ public class CompanyCustomerEvaluationFormUpdateTask extends Tasker { CompanyCustomerFileVo customerFile = new CompanyCustomerFileVo(); customerFile.setCustomer(customer.getId()); customerFile.setFilePath(destFile.getAbsolutePath()); - customerFile.setType(CompanyCustomerFileType.General); + customerFile.setType(CustomerFileType.General); save(customerFile); } catch (Exception e) { holder.error(e.getMessage()); @@ -192,7 +192,7 @@ public class CompanyCustomerEvaluationFormUpdateTask extends Tasker { // 检索评估表 List customerFiles = getCompanyCustomerFileService().findAllByCustomerAndType(customer, - CompanyCustomerFileType.EvaluationForm); + CustomerFileType.EvaluationForm); List filteredList = customerFiles.stream().filter(file -> { return file.getSignDate() != null && file.isValid(); diff --git a/client/src/main/java/com/ecep/contract/controller/customer/CustomerTabSkinFile.java b/client/src/main/java/com/ecep/contract/controller/customer/CustomerTabSkinFile.java index a97fa30..6814399 100644 --- a/client/src/main/java/com/ecep/contract/controller/customer/CustomerTabSkinFile.java +++ b/client/src/main/java/com/ecep/contract/controller/customer/CustomerTabSkinFile.java @@ -9,7 +9,7 @@ import java.util.function.Consumer; import org.springframework.util.StringUtils; -import com.ecep.contract.CompanyCustomerFileType; +import com.ecep.contract.CustomerFileType; import com.ecep.contract.DesktopUtils; import com.ecep.contract.Message; import com.ecep.contract.MyDateTimeUtils; @@ -106,7 +106,7 @@ public class CustomerTabSkinFile table.disableProperty().bind(viewModel.getPath().isEmpty()); fileTable_idColumn.setCellValueFactory(param -> param.getValue().getId()); CompanyCustomerFileTypeService fileTypeService = getCachedBean(CompanyCustomerFileTypeService.class); - ObservableMap observableMapByLocal = FXCollections + ObservableMap observableMapByLocal = FXCollections .observableMap(fileTypeService.findAll(getLocale())); fileTable_typeColumn.setCellValueFactory(param -> Bindings.valueAt(observableMapByLocal, param.getValue().getType()).map(BaseEnumEntity::getValue)); @@ -156,8 +156,8 @@ public class CustomerTabSkinFile @Override protected void onTableRowDoubleClickedAction(CompanyCustomerFileViewModel item) { - CompanyCustomerFileType fileType = item.getType().get(); - if (fileType == CompanyCustomerFileType.EvaluationForm) { + CustomerFileType fileType = item.getType().get(); + if (fileType == CustomerFileType.EvaluationForm) { CompanyCustomerEvaluationFormFileVo evaluationFormFile = getCachedBean( CompanyCustomerEvaluationFormFileService.class).findByCustomerFile(item.getId().get()); // 文件不是 Excel 文件时，打开编辑UI @@ -201,7 +201,7 @@ public class CustomerTabSkinFile if (file.renameTo(dest)) { CompanyCustomerFileVo ccf = new CompanyCustomerFileVo(); ccf.setCustomer(companyCustomer.getId()); - ccf.setType(CompanyCustomerFileType.EvaluationForm); + ccf.setType(CustomerFileType.EvaluationForm); ccf.setFilePath(dest.getAbsolutePath()); ccf.setSignDate(nextSignDate); ccf.setValid(false); @@ -228,7 +228,7 @@ public class CustomerTabSkinFile if (file.renameTo(dest)) { CompanyCustomerFileVo ccf = new CompanyCustomerFileVo(); ccf.setCustomer(companyCustomer.getId()); - ccf.setType(CompanyCustomerFileType.General); + ccf.setType(CustomerFileType.General); ccf.setFilePath(dest.getAbsolutePath()); ccf.setValid(false); getCompanyCustomerFileService().save(ccf); diff --git a/client/src/main/java/com/ecep/contract/controller/project/bid/ProjectBidTabSkinBase.java b/client/src/main/java/com/ecep/contract/controller/project/bid/ProjectBidTabSkinBase.java index 061873f..334fe0a 100644 --- a/client/src/main/java/com/ecep/contract/controller/project/bid/ProjectBidTabSkinBase.java +++ b/client/src/main/java/com/ecep/contract/controller/project/bid/ProjectBidTabSkinBase.java @@ -1,6 +1,6 @@ package com.ecep.contract.controller.project.bid; -import com.ecep.contract.CompanyCustomerFileType; +import com.ecep.contract.CustomerFileType; import com.ecep.contract.ContractFileType; import com.ecep.contract.DesktopUtils; import com.ecep.contract.MyDateTimeUtils; @@ -10,10 +10,7 @@ import com.ecep.contract.controller.tab.AbstEntityBasedTabSkin; import com.ecep.contract.controller.tab.TabSkin; import com.ecep.contract.converter.CompanyStringConverter; import com.ecep.contract.converter.EmployeeStringConverter; -import com.ecep.contract.converter.EntityStringConverter; import com.ecep.contract.service.*; -import com.ecep.contract.util.ParamUtils; -import com.ecep.contract.util.ProxyUtils; import com.ecep.contract.util.UITools; import com.ecep.contract.vm.ProjectBidViewModel; import com.ecep.contract.vo.*; @@ -28,10 +25,8 @@ import javafx.util.converter.LocalDateStringConverter; import javafx.util.converter.LocalDateTimeStringConverter; import javafx.util.converter.NumberStringConverter; import lombok.Setter; -import org.springframework.data.domain.Pageable; import java.io.File; -import java.text.NumberFormat; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; @@ -281,7 +276,7 @@ public class ProjectBidTabSkinBase // 获取客户资信评估表 List list = fileService.findAllByCustomerAndType(customer, - CompanyCustomerFileType.EvaluationForm); + CustomerFileType.EvaluationForm); if (list.isEmpty()) { // 没有评估表 return; @@ -292,7 +287,7 @@ public class ProjectBidTabSkinBase LocalDate verifyDate = applyTime.toLocalDate(); CompanyCustomerFileVo file = list.stream() .filter(v -> v.getSignDate() != null && v.isValid()) - .filter(v -> v.getType() == CompanyCustomerFileType.EvaluationForm) + .filter(v -> v.getType() == CustomerFileType.EvaluationForm) .filter(v -> MyDateTimeUtils.dateValidFilter(verifyDate, v.getSignDate(), v.getSignDate().plusYears(1), 7)) .findFirst().orElse(null); diff --git a/client/src/main/java/com/ecep/contract/controller/project/satisfaction_survey/CustomerSatisfactionSurveyTabSkinBase.java b/client/src/main/java/com/ecep/contract/controller/project/satisfaction_survey/CustomerSatisfactionSurveyTabSkinBase.java index 938e467..f2af97b 100644 --- a/client/src/main/java/com/ecep/contract/controller/project/satisfaction_survey/CustomerSatisfactionSurveyTabSkinBase.java +++ b/client/src/main/java/com/ecep/contract/controller/project/satisfaction_survey/CustomerSatisfactionSurveyTabSkinBase.java @@ -10,7 +10,7 @@ import java.util.stream.Collectors; import org.springframework.util.StringUtils; -import com.ecep.contract.CompanyCustomerFileType; +import com.ecep.contract.CustomerFileType; import com.ecep.contract.MyDateTimeUtils; import com.ecep.contract.controller.tab.AbstEntityBasedTabSkin; import com.ecep.contract.controller.tab.TabSkin; @@ -235,7 +235,7 @@ public class CustomerSatisfactionSurveyTabSkinBase CompanyCustomerFileService companyCustomerFileService = getBean(CompanyCustomerFileService.class); List list = companyCustomerFileService.findAllByCustomerAndType(customer, - CompanyCustomerFileType.EvaluationForm); + CustomerFileType.EvaluationForm); if (list.isEmpty()) { return; } @@ -244,7 +244,7 @@ public class CustomerSatisfactionSurveyTabSkinBase LocalDate verifyDate = applyTime.toLocalDate(); CompanyCustomerFileVo file = list.stream() .filter(v -> v.getSignDate() != null && v.isValid()) - .filter(v -> v.getType() == CompanyCustomerFileType.EvaluationForm) + .filter(v -> v.getType() == CustomerFileType.EvaluationForm) .filter(v -> MyDateTimeUtils.dateValidFilter(verifyDate, v.getSignDate(), v.getSignDate().plusYears(1), 7)) .findFirst().orElse(null); diff --git a/client/src/main/java/com/ecep/contract/controller/table/cell/VendorTypeTableCell.java b/client/src/main/java/com/ecep/contract/controller/table/cell/VendorTypeTableCell.java new file mode 100644 index 0000000..57ec83c --- /dev/null +++ b/client/src/main/java/com/ecep/contract/controller/table/cell/VendorTypeTableCell.java @@ -0,0 +1,42 @@ +package com.ecep.contract.controller.table.cell; + +import com.ecep.contract.SpringApp; +import com.ecep.contract.VendorType; +import com.ecep.contract.service.VendorTypeService; +import com.ecep.contract.vo.VendorTypeLocalVo; + +import javafx.scene.control.TableCell; +import javafx.scene.control.TableColumn; +import javafx.util.Callback; + +/** + * 供应商类型单元格，用于在表格中显示供应商类型信息 + */ +public class VendorTypeTableCell extends AsyncUpdateTableCell { + private VendorTypeService vendorTypeService; + + /** + * 创建一个用于表格列的单元格工厂 + */ + public static Callback, TableCell> forTableColumn( + VendorTypeService service) { + return param -> new VendorTypeTableCell<>(service); + } + + public VendorTypeTableCell() { + this.vendorTypeService = SpringApp.getBean(VendorTypeService.class); + } + + public VendorTypeTableCell(VendorTypeService service) { + setService(service); + } + + @Override + protected VendorTypeService getServiceBean() { + if (vendorTypeService == null) { + vendorTypeService = SpringApp.getBean(VendorTypeService.class); + } + return vendorTypeService; + } + +} \ No newline at end of file diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/CompanyVendorManagerSkin.java b/client/src/main/java/com/ecep/contract/controller/vendor/CompanyVendorManagerSkin.java index b41700a..8aa8d40 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/CompanyVendorManagerSkin.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/CompanyVendorManagerSkin.java @@ -1,16 +1,11 @@ package com.ecep.contract.controller.vendor; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - import com.ecep.contract.MyDateTimeUtils; import com.ecep.contract.controller.AbstEntityManagerSkin; import com.ecep.contract.controller.ComboBoxUtils; import com.ecep.contract.controller.table.cell.CompanyTableCell; -import com.ecep.contract.model.CompanyVendor; -import com.ecep.contract.model.VendorCatalog; -import com.ecep.contract.model.VendorTypeLocal; +import com.ecep.contract.controller.table.cell.VendorCatalogTableCell; +import com.ecep.contract.controller.table.cell.VendorTypeTableCell; import com.ecep.contract.service.CompanyService; import com.ecep.contract.service.CompanyVendorService; import com.ecep.contract.service.VendorCatalogService; @@ -18,11 +13,7 @@ import com.ecep.contract.service.VendorTypeService; import com.ecep.contract.util.ParamUtils; import com.ecep.contract.vm.CompanyVendorViewModel; import com.ecep.contract.vo.CompanyVendorVo; -import com.ecep.contract.vo.VendorCatalogVo; - import javafx.application.Platform; -import javafx.beans.binding.Bindings; -import javafx.beans.property.SimpleObjectProperty; import lombok.Setter; public class CompanyVendorManagerSkin @@ -63,41 +54,21 @@ public class CompanyVendorManagerSkin @Override public void initializeTable() { - List vendorTypeLocals = getBean(VendorTypeService.class).findAll(); - ComboBoxUtils.initialComboBox(controller.typeSelector, vendorTypeLocals, true); - controller.typeSelector.valueProperty().addListener((observable, oldValue, newValue) -> { - loadTableDataSet(true); - }); + ComboBoxUtils.initialComboBox(controller.typeSelector, null, getBean(VendorTypeService.class), true); controller.idColumn.setCellValueFactory(param -> param.getValue().getId()); controller.codeColumn.setCellValueFactory(param -> param.getValue().getCode()); - controller.catalogColumn.setCellValueFactory(param -> Bindings.createStringBinding(() -> { - SimpleObjectProperty catalog = param.getValue().getCatalog(); - Integer catalogId = catalog.get(); - if (catalogId == null) { - return "-"; - } - VendorCatalogVo vendorCatalog = getBean(VendorCatalogService.class).findById(catalogId); - if (vendorCatalog == null) { - return "-"; - } else { - return vendorCatalog.getName(); - } - }, param.getValue().getCatalog())); + controller.catalogColumn.setCellValueFactory(param -> param.getValue().getCatalog()); + controller.catalogColumn.setCellFactory(VendorCatalogTableCell.forTableColumn(getBean(VendorCatalogService.class))); - controller.typeColumn.setCellValueFactory(param -> param.getValue().getType().map(type -> { - VendorTypeLocal local = vendorTypeLocals.stream().filter(v -> v.getType() == type).findFirst().orElse(null); - if (local == null) { - return type.name(); - } else { - return local.getValue(); - } - })); + + controller.typeColumn.setCellValueFactory(param -> param.getValue().getType()); + controller.typeColumn.setCellFactory(VendorTypeTableCell.forTableColumn(getBean(VendorTypeService.class))); controller.purchaseColumn.setCellValueFactory(param -> param.getValue().getPurchase()); controller.companyColumn.setCellValueFactory(param -> param.getValue().getCompany()); - controller.companyColumn.setCellFactory(param -> new CompanyTableCell<>(getCompanyService())); + controller.companyColumn.setCellFactory(CompanyTableCell.forTableColumn(getCompanyService())); controller.developDateColumn.setCellValueFactory(param -> param.getValue().getDevelopDate()); controller.pathColumn.setCellValueFactory(param -> param.getValue().getPath()); diff --git a/client/src/main/java/com/ecep/contract/controller/vendor/CompanyVendorManagerWindowController.java b/client/src/main/java/com/ecep/contract/controller/vendor/CompanyVendorManagerWindowController.java index f6bdcea..ce6120e 100644 --- a/client/src/main/java/com/ecep/contract/controller/vendor/CompanyVendorManagerWindowController.java +++ b/client/src/main/java/com/ecep/contract/controller/vendor/CompanyVendorManagerWindowController.java @@ -12,11 +12,10 @@ import org.springframework.data.domain.Pageable; 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.group.VendorGroupManagerWindowController; -import com.ecep.contract.model.CompanyVendor; -import com.ecep.contract.model.VendorTypeLocal; import com.ecep.contract.service.CompanyService; import com.ecep.contract.service.CompanyVendorService; import com.ecep.contract.task.VendorVerifyAllTasker; @@ -24,6 +23,7 @@ import com.ecep.contract.util.FxmlPath; import com.ecep.contract.util.UITools; import com.ecep.contract.vm.CompanyVendorViewModel; import com.ecep.contract.vo.CompanyVendorVo; +import com.ecep.contract.vo.VendorTypeLocalVo; import javafx.event.ActionEvent; import javafx.scene.control.ComboBox; @@ -41,14 +41,14 @@ public class CompanyVendorManagerWindowController public TableColumn idColumn; public TableColumn companyColumn; public TableColumn codeColumn; - public TableColumn catalogColumn; - public TableColumn typeColumn; + public TableColumn catalogColumn; + public TableColumn typeColumn; public TableColumn purchaseColumn; public TableColumn developDateColumn; public TableColumn pathColumn; public TableColumn createdColumn; - public ComboBox typeSelector; + public ComboBox typeSelector; @Autowired private CompanyService companyService; diff --git a/client/src/main/java/com/ecep/contract/service/CompanyCustomerFileService.java b/client/src/main/java/com/ecep/contract/service/CompanyCustomerFileService.java index 7c01387..02256f5 100644 --- a/client/src/main/java/com/ecep/contract/service/CompanyCustomerFileService.java +++ b/client/src/main/java/com/ecep/contract/service/CompanyCustomerFileService.java @@ -12,7 +12,7 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import com.ecep.contract.CompanyCustomerFileType; +import com.ecep.contract.CustomerFileType; import com.ecep.contract.MessageHolder; import com.ecep.contract.SpringApp; import com.ecep.contract.model.CompanyCustomer; @@ -49,7 +49,7 @@ public class CompanyCustomerFileService extends QueryService files = findAllByCustomerAndType(companyCustomer, - CompanyCustomerFileType.EvaluationForm); + CustomerFileType.EvaluationForm); CompanyCustomerFileVo latestFile = files.stream() .filter(v -> v.getSignDate() != null && v.isValid()) .max(Comparator.comparing(CompanyCustomerFileVo::getSignDate)) @@ -104,7 +104,7 @@ public class CompanyCustomerFileService extends QueryService findAllByCustomerAndType(CompanyCustomerVo customer, CompanyCustomerFileType type) { + public List findAllByCustomerAndType(CompanyCustomerVo customer, CustomerFileType type) { return findAll(ParamUtils.builder() .equals("customer", customer.getId()) .equals("type", type.name()) diff --git a/client/src/main/java/com/ecep/contract/service/CompanyCustomerFileTypeService.java b/client/src/main/java/com/ecep/contract/service/CompanyCustomerFileTypeService.java index 8d5ee6b..9a9a4e0 100644 --- a/client/src/main/java/com/ecep/contract/service/CompanyCustomerFileTypeService.java +++ b/client/src/main/java/com/ecep/contract/service/CompanyCustomerFileTypeService.java @@ -1,6 +1,6 @@ package com.ecep.contract.service; -import com.ecep.contract.CompanyCustomerFileType; +import com.ecep.contract.CustomerFileType; import com.ecep.contract.model.CompanyCustomerFileTypeLocal; import com.ecep.contract.vm.CompanyCustomerFileTypeLocalViewModel; import org.springframework.cache.annotation.CacheConfig; @@ -18,7 +18,7 @@ import java.util.stream.Collectors; @CacheConfig(cacheNames = "company-file-type") public class CompanyCustomerFileTypeService extends QueryService{ @Cacheable - public Map findAll(Locale locale) { + public Map findAll(Locale locale) { Map params = new HashMap<>(); params.put("lang", locale.toLanguageTag()); return findAll(params, Pageable.unpaged()).stream() diff --git a/client/src/main/java/com/ecep/contract/service/VendorTypeService.java b/client/src/main/java/com/ecep/contract/service/VendorTypeService.java index 9a65a2b..ce55112 100644 --- a/client/src/main/java/com/ecep/contract/service/VendorTypeService.java +++ b/client/src/main/java/com/ecep/contract/service/VendorTypeService.java @@ -2,6 +2,7 @@ package com.ecep.contract.service; import com.ecep.contract.model.VendorTypeLocal; import com.ecep.contract.vm.VendorTypeLocalViewModel; +import com.ecep.contract.vo.VendorTypeLocalVo; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; @@ -12,28 +13,28 @@ import java.util.List; @Service @CacheConfig(cacheNames = "vendor-type") -public class VendorTypeService extends QueryService { +public class VendorTypeService extends QueryService { @Cacheable(key = "#p0") @Override - public VendorTypeLocal findById(Integer id) { + public VendorTypeLocalVo findById(Integer id) { return super.findById(id); } @Cacheable(key = "'all'") @Override - public List findAll() { + public List findAll() { return super.findAll(); } @Caching(put = {@CachePut(key = "#p0.id"), @CachePut(key = "'all'")}) @Override - public VendorTypeLocal save(VendorTypeLocal entity) { + public VendorTypeLocalVo save(VendorTypeLocalVo entity) { return super.save(entity); } @Caching(put = {@CachePut(key = "#p0.id"), @CachePut(key = "'all'")}) @Override - public void delete(VendorTypeLocal entity) { + public void delete(VendorTypeLocalVo entity) { super.delete(entity); } } 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 6625f78..4849d60 100644 --- a/client/src/main/java/com/ecep/contract/task/ContractVerifyComm.java +++ b/client/src/main/java/com/ecep/contract/task/ContractVerifyComm.java @@ -16,7 +16,7 @@ import java.util.stream.Collectors; import com.ecep.contract.vo.*; import org.springframework.util.StringUtils; -import com.ecep.contract.CompanyCustomerFileType; +import com.ecep.contract.CustomerFileType; import com.ecep.contract.ContractFileType; import com.ecep.contract.ContractPayWay; import com.ecep.contract.MessageHolder; @@ -24,9 +24,7 @@ import com.ecep.contract.MyDateTimeUtils; import com.ecep.contract.SpringApp; import com.ecep.contract.controller.project.cost.ProjectCostImportItemsFromContractsTasker; import com.ecep.contract.model.Contract; -import com.ecep.contract.model.ContractBidVendor; import com.ecep.contract.model.ContractFileTypeLocal; -import com.ecep.contract.model.VendorGroupRequireFileType; import com.ecep.contract.service.CompanyCustomerFileService; import com.ecep.contract.service.CompanyCustomerService; import com.ecep.contract.service.CompanyExtendInfoService; @@ -690,7 +688,7 @@ public class ContractVerifyComm { for (LocalDate verifyDate : verifyDates) { CompanyCustomerFileVo customerFile = files.stream() .filter(v -> v.getSignDate() != null && v.isValid()) - .filter(v -> v.getType() == CompanyCustomerFileType.EvaluationForm) + .filter(v -> v.getType() == CustomerFileType.EvaluationForm) .filter(v -> MyDateTimeUtils.dateValidFilter(verifyDate, v.getSignDate(), v.getSignDate().plusYears(1), 7)) .findFirst().orElse(null); @@ -701,7 +699,7 @@ public class ContractVerifyComm { CompanyCustomerFileVo latestFile = files.stream() .filter(v -> v.getSignDate() != null && v.isValid()) - .filter(v -> v.getType() == CompanyCustomerFileType.EvaluationForm) + .filter(v -> v.getType() == CustomerFileType.EvaluationForm) .max(Comparator.comparing(CompanyCustomerFileVo::getSignDate)) .orElse(null); diff --git a/client/src/main/java/com/ecep/contract/vm/CompanyCustomerFileTypeLocalViewModel.java b/client/src/main/java/com/ecep/contract/vm/CompanyCustomerFileTypeLocalViewModel.java index becbf64..d0d4981 100644 --- a/client/src/main/java/com/ecep/contract/vm/CompanyCustomerFileTypeLocalViewModel.java +++ b/client/src/main/java/com/ecep/contract/vm/CompanyCustomerFileTypeLocalViewModel.java @@ -1,12 +1,12 @@ package com.ecep.contract.vm; -import com.ecep.contract.CompanyCustomerFileType; +import com.ecep.contract.CustomerFileType; import com.ecep.contract.model.CompanyCustomerFileTypeLocal; import lombok.Data; import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) -public class CompanyCustomerFileTypeLocalViewModel extends EnumViewModel { +public class CompanyCustomerFileTypeLocalViewModel extends EnumViewModel { } diff --git a/client/src/main/java/com/ecep/contract/vm/CompanyCustomerFileViewModel.java b/client/src/main/java/com/ecep/contract/vm/CompanyCustomerFileViewModel.java index 344fcaf..cb31d40 100644 --- a/client/src/main/java/com/ecep/contract/vm/CompanyCustomerFileViewModel.java +++ b/client/src/main/java/com/ecep/contract/vm/CompanyCustomerFileViewModel.java @@ -3,7 +3,7 @@ package com.ecep.contract.vm; import java.time.LocalDate; import java.util.Objects; -import com.ecep.contract.CompanyCustomerFileType; +import com.ecep.contract.CustomerFileType; import com.ecep.contract.vo.CompanyCustomerFileVo; import javafx.beans.property.SimpleBooleanProperty; @@ -32,7 +32,7 @@ public class CompanyCustomerFileViewModel extends IdentityViewModel type = new SimpleObjectProperty<>(); + private SimpleObjectProperty type = new SimpleObjectProperty<>(); private SimpleStringProperty filePath = new SimpleStringProperty(); diff --git a/client/src/main/java/com/ecep/contract/vm/CompanyFileTypeLocalViewModel.java b/client/src/main/java/com/ecep/contract/vm/CompanyFileTypeLocalViewModel.java index 9e5c2b4..52eda10 100644 --- a/client/src/main/java/com/ecep/contract/vm/CompanyFileTypeLocalViewModel.java +++ b/client/src/main/java/com/ecep/contract/vm/CompanyFileTypeLocalViewModel.java @@ -3,22 +3,25 @@ package com.ecep.contract.vm; import java.util.Objects; import com.ecep.contract.CompanyFileType; -import com.ecep.contract.model.CompanyFileTypeLocal; +import com.ecep.contract.vo.CompanyFileTypeLocalVo; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleStringProperty; import lombok.Data; import lombok.EqualsAndHashCode; +/** + * 文件类型本地化信息 + */ @Data @EqualsAndHashCode(callSuper = false) -public class CompanyFileTypeLocalViewModel extends IdentityViewModel { +public class CompanyFileTypeLocalViewModel extends IdentityViewModel { private SimpleObjectProperty type = new SimpleObjectProperty<>(); private SimpleStringProperty lang = new SimpleStringProperty(); private SimpleStringProperty value = new SimpleStringProperty(); @Override - protected void updateFrom(CompanyFileTypeLocal v) { + protected void updateFrom(CompanyFileTypeLocalVo v) { super.updateFrom(v); type.set(v.getType()); lang.set(v.getLang()); @@ -26,7 +29,7 @@ public class CompanyFileTypeLocalViewModel extends IdentityViewModel { +public class VendorTypeLocalViewModel extends EnumViewModel { } diff --git a/common/src/main/java/com/ecep/contract/CustomerFileType.java b/common/src/main/java/com/ecep/contract/CustomerFileType.java index aeb637d..b4d9709 100644 --- a/common/src/main/java/com/ecep/contract/CustomerFileType.java +++ b/common/src/main/java/com/ecep/contract/CustomerFileType.java @@ -1,6 +1,6 @@ package com.ecep.contract; -public enum CompanyCustomerFileType { +public enum CustomerFileType { /** * 普通文件，一般文件 */ diff --git a/common/src/main/java/com/ecep/contract/model/BaseEnumEntity.java b/common/src/main/java/com/ecep/contract/model/BaseEnumEntity.java index 8c9aaeb..8339231 100644 --- a/common/src/main/java/com/ecep/contract/model/BaseEnumEntity.java +++ b/common/src/main/java/com/ecep/contract/model/BaseEnumEntity.java @@ -34,6 +34,5 @@ public abstract class BaseEnumEntity> implements IdentityEntit @Column(name = "VALUE") private String value; - } \ No newline at end of file diff --git a/common/src/main/java/com/ecep/contract/model/CompanyCustomerFile.java b/common/src/main/java/com/ecep/contract/model/CompanyCustomerFile.java index e45eaef..5677293 100644 --- a/common/src/main/java/com/ecep/contract/model/CompanyCustomerFile.java +++ b/common/src/main/java/com/ecep/contract/model/CompanyCustomerFile.java @@ -4,7 +4,7 @@ import java.io.Serializable; import java.time.LocalDate; import java.util.Objects; -import com.ecep.contract.CompanyCustomerFileType; +import com.ecep.contract.CustomerFileType; import com.ecep.contract.util.HibernateProxyUtils; import jakarta.persistence.Column; @@ -27,7 +27,7 @@ import lombok.ToString; @Entity @Table(name = "COMPANY_CUSTOMER_FILE") @ToString -public class CompanyCustomerFile implements CompanyBasicFile, Serializable { +public class CompanyCustomerFile implements CompanyBasicFile, Serializable { private static final long serialVersionUID = 1L; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -41,7 +41,7 @@ public class CompanyCustomerFile implements CompanyBasicFile implements Serializable { +public class CompanyCustomerFileTypeLocal extends BaseEnumEntity implements Serializable { private static final long serialVersionUID = 1L; @Override diff --git a/common/src/main/java/com/ecep/contract/model/ContractFileTypeLocal.java b/common/src/main/java/com/ecep/contract/model/ContractFileTypeLocal.java index d9682f6..ad8dd07 100644 --- a/common/src/main/java/com/ecep/contract/model/ContractFileTypeLocal.java +++ b/common/src/main/java/com/ecep/contract/model/ContractFileTypeLocal.java @@ -55,7 +55,7 @@ public class ContractFileTypeLocal extends BaseEnumEntity impl public ContractFileTypeLocalVo toVo() { ContractFileTypeLocalVo vo = new ContractFileTypeLocalVo(); vo.setId(getId()); - vo.setLanguage(getLang()); + vo.setLang(getLang()); vo.setType(getType()); vo.setDescription(getDescription()); vo.setSuggestFileName(suggestFileName); diff --git a/common/src/main/java/com/ecep/contract/vo/CompanyCustomerFileVo.java b/common/src/main/java/com/ecep/contract/vo/CompanyCustomerFileVo.java index 1065c93..26f0683 100644 --- a/common/src/main/java/com/ecep/contract/vo/CompanyCustomerFileVo.java +++ b/common/src/main/java/com/ecep/contract/vo/CompanyCustomerFileVo.java @@ -1,7 +1,7 @@ package com.ecep.contract.vo; import com.ecep.contract.model.IdentityEntity; -import com.ecep.contract.CompanyCustomerFileType; +import com.ecep.contract.CustomerFileType; import java.time.LocalDate; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.Data; public class CompanyCustomerFileVo implements IdentityEntity { private Integer id; private Integer customer; - private CompanyCustomerFileType type; + private CustomerFileType type; private String filePath; private String editFilePath; private LocalDate signDate; diff --git a/common/src/main/java/com/ecep/contract/vo/CompanyFileTypeLocalVo.java b/common/src/main/java/com/ecep/contract/vo/CompanyFileTypeLocalVo.java index 2a11034..947e642 100644 --- a/common/src/main/java/com/ecep/contract/vo/CompanyFileTypeLocalVo.java +++ b/common/src/main/java/com/ecep/contract/vo/CompanyFileTypeLocalVo.java @@ -1,14 +1,12 @@ package com.ecep.contract.vo; import com.ecep.contract.CompanyFileType; +import com.ecep.contract.VendorType; +import com.ecep.contract.model.BaseEnumEntity; import com.ecep.contract.model.IdentityEntity; import lombok.Data; @Data -public class CompanyFileTypeLocalVo implements IdentityEntity { - private Integer id; - private String name; - private CompanyFileType value; - private Integer orderNum = 0; +public class CompanyFileTypeLocalVo extends BaseEnumEntity implements IdentityEntity { private boolean active = false; } \ No newline at end of file diff --git a/common/src/main/java/com/ecep/contract/vo/ContractFileTypeLocalVo.java b/common/src/main/java/com/ecep/contract/vo/ContractFileTypeLocalVo.java index 9951e5f..e97475a 100644 --- a/common/src/main/java/com/ecep/contract/vo/ContractFileTypeLocalVo.java +++ b/common/src/main/java/com/ecep/contract/vo/ContractFileTypeLocalVo.java @@ -1,14 +1,13 @@ package com.ecep.contract.vo; +import com.ecep.contract.VendorFileType; +import com.ecep.contract.model.BaseEnumEntity; import com.ecep.contract.model.IdentityEntity; import com.ecep.contract.ContractFileType; import lombok.Data; @Data -public class ContractFileTypeLocalVo implements IdentityEntity { - private Integer id; - private String language; - private ContractFileType type; +public class ContractFileTypeLocalVo extends BaseEnumEntity implements IdentityEntity { private String description; private String suggestFileName; } \ No newline at end of file diff --git a/common/src/main/java/com/ecep/contract/vo/CustomerFileTypeLocalVo.java b/common/src/main/java/com/ecep/contract/vo/CustomerFileTypeLocalVo.java index 8d73583..60c435d 100644 --- a/common/src/main/java/com/ecep/contract/vo/CustomerFileTypeLocalVo.java +++ b/common/src/main/java/com/ecep/contract/vo/CustomerFileTypeLocalVo.java @@ -1,14 +1,13 @@ package com.ecep.contract.vo; -import com.ecep.contract.CompanyCustomerFileType; -import com.ecep.contract.CompanyFileType; +import com.ecep.contract.CustomerFileType; import com.ecep.contract.model.BaseEnumEntity; import com.ecep.contract.model.IdentityEntity; import lombok.Data; @Data -public class CompanyCustomerFileTypeLocalVo - extends BaseEnumEntity +public class CustomerFileTypeLocalVo + extends BaseEnumEntity implements IdentityEntity { private Integer orderNum = 0; private boolean active = false; diff --git a/common/src/main/java/com/ecep/contract/vo/VendorFileTypeLocalVo.java b/common/src/main/java/com/ecep/contract/vo/VendorFileTypeLocalVo.java index aa321e6..74f8d66 100644 --- a/common/src/main/java/com/ecep/contract/vo/VendorFileTypeLocalVo.java +++ b/common/src/main/java/com/ecep/contract/vo/VendorFileTypeLocalVo.java @@ -1,4 +1,11 @@ package com.ecep.contract.vo; -public class VendorFileTypeLocalVo { +import com.ecep.contract.VendorFileType; +import com.ecep.contract.model.BaseEnumEntity; +import com.ecep.contract.model.IdentityEntity; +import lombok.Data; + +@Data +public class VendorFileTypeLocalVo extends BaseEnumEntity + implements IdentityEntity { } diff --git a/common/src/main/java/com/ecep/contract/vo/VendorTypeLocalVo.java b/common/src/main/java/com/ecep/contract/vo/VendorTypeLocalVo.java index f23c2a6..e47d9f1 100644 --- a/common/src/main/java/com/ecep/contract/vo/VendorTypeLocalVo.java +++ b/common/src/main/java/com/ecep/contract/vo/VendorTypeLocalVo.java @@ -1,14 +1,11 @@ package com.ecep.contract.vo; +import com.ecep.contract.model.BaseEnumEntity; import com.ecep.contract.model.IdentityEntity; import com.ecep.contract.VendorType; import lombok.Data; @Data -public class VendorTypeLocalVo implements IdentityEntity { - private Integer id; - private String language; - private VendorType type; - private String name; - private String description; +public class VendorTypeLocalVo extends BaseEnumEntity implements IdentityEntity { + } \ No newline at end of file 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 a324957..df7996c 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 @@ -17,7 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.util.StringUtils; -import com.ecep.contract.CompanyCustomerFileType; +import com.ecep.contract.CustomerFileType; import com.ecep.contract.VendorFileType; import com.ecep.contract.SpringApp; import com.ecep.contract.ds.company.CompanyFileUtils; @@ -164,7 +164,7 @@ public abstract class CompanyBasicService { * @see CompanyVendorFile * @see VendorFileType * @see CompanyCustomerFile - * @see CompanyCustomerFileType + * @see CustomerFileType */ protected abstract > boolean fillFileAsDefaultType(F dbFile, File file, Consumer status); 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 a0be886..47aa892 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 @@ -18,7 +18,7 @@ import org.hibernate.Hibernate; import org.springframework.security.core.userdetails.User; import org.springframework.util.StringUtils; -import com.ecep.contract.CompanyCustomerFileType; +import com.ecep.contract.CustomerFileType; import com.ecep.contract.ContractFileType; import com.ecep.contract.ContractPayWay; import com.ecep.contract.MessageHolder; @@ -695,7 +695,7 @@ public class ContractVerifyComm { for (LocalDate verifyDate : verifyDates) { CompanyCustomerFile customerFile = files.stream() .filter(v -> v.getSignDate() != null && v.isValid()) - .filter(v -> v.getType() == CompanyCustomerFileType.EvaluationForm) + .filter(v -> v.getType() == CustomerFileType.EvaluationForm) .filter(v -> MyDateTimeUtils.dateValidFilter(verifyDate, v.getSignDate(), v.getSignDate().plusYears(1), 7)) .findFirst().orElse(null); @@ -706,7 +706,7 @@ public class ContractVerifyComm { CompanyCustomerFile latestFile = files.stream() .filter(v -> v.getSignDate() != null && v.isValid()) - .filter(v -> v.getType() == CompanyCustomerFileType.EvaluationForm) + .filter(v -> v.getType() == CustomerFileType.EvaluationForm) .max(Comparator.comparing(CompanyCustomerFile::getSignDate)) .orElse(null); diff --git a/server/src/main/java/com/ecep/contract/ds/customer/repository/CompanyCustomerFileRepository.java b/server/src/main/java/com/ecep/contract/ds/customer/repository/CompanyCustomerFileRepository.java index c438bc2..f9b2586 100644 --- a/server/src/main/java/com/ecep/contract/ds/customer/repository/CompanyCustomerFileRepository.java +++ b/server/src/main/java/com/ecep/contract/ds/customer/repository/CompanyCustomerFileRepository.java @@ -4,7 +4,7 @@ import java.util.List; import org.springframework.stereotype.Repository; -import com.ecep.contract.CompanyCustomerFileType; +import com.ecep.contract.CustomerFileType; import com.ecep.contract.ds.MyRepository; import com.ecep.contract.model.CompanyCustomer; import com.ecep.contract.model.CompanyCustomerFile; @@ -14,5 +14,5 @@ public interface CompanyCustomerFileRepository extends MyRepository findAllByCustomer(CompanyCustomer companyCustomer); - List findAllByCustomerAndType(CompanyCustomer customer, CompanyCustomerFileType type); + List findAllByCustomerAndType(CompanyCustomer customer, CustomerFileType type); } \ No newline at end of file diff --git a/server/src/main/java/com/ecep/contract/ds/customer/repository/CompanyCustomerFileTypeLocalRepository.java b/server/src/main/java/com/ecep/contract/ds/customer/repository/CompanyCustomerFileTypeLocalRepository.java index 0e33be4..dbf2263 100644 --- a/server/src/main/java/com/ecep/contract/ds/customer/repository/CompanyCustomerFileTypeLocalRepository.java +++ b/server/src/main/java/com/ecep/contract/ds/customer/repository/CompanyCustomerFileTypeLocalRepository.java @@ -2,17 +2,17 @@ package com.ecep.contract.ds.customer.repository; import org.springframework.stereotype.Repository; -import com.ecep.contract.CompanyCustomerFileType; +import com.ecep.contract.CustomerFileType; import com.ecep.contract.ds.other.repository.BaseEnumEntityRepository; import com.ecep.contract.model.CompanyCustomerFileTypeLocal; @Repository public interface CompanyCustomerFileTypeLocalRepository - extends BaseEnumEntityRepository { + extends BaseEnumEntityRepository { @Override - default CompanyCustomerFileType[] getEnumConstants() { - return CompanyCustomerFileType.values(); + default CustomerFileType[] getEnumConstants() { + return CustomerFileType.values(); } @Override diff --git a/server/src/main/java/com/ecep/contract/ds/customer/service/CompanyCustomerFileService.java b/server/src/main/java/com/ecep/contract/ds/customer/service/CompanyCustomerFileService.java index ca3ab75..77a4098 100644 --- a/server/src/main/java/com/ecep/contract/ds/customer/service/CompanyCustomerFileService.java +++ b/server/src/main/java/com/ecep/contract/ds/customer/service/CompanyCustomerFileService.java @@ -25,7 +25,7 @@ import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; -import com.ecep.contract.CompanyCustomerFileType; +import com.ecep.contract.CustomerFileType; import com.ecep.contract.IEntityService; import com.ecep.contract.SpringApp; import com.ecep.contract.constant.CompanyCustomerConstant; @@ -72,7 +72,7 @@ public class CompanyCustomerFileService implements IEntityService findAllByCustomerAndType(CompanyCustomer customer, CompanyCustomerFileType type) { + public List findAllByCustomerAndType(CompanyCustomer customer, CustomerFileType type) { return companyCustomerFileRepository.findAllByCustomerAndType(customer, type); } public List findAllCustomerEvaluationFormFiles(CompanyCustomer companyCustomer) { - return findAllByCustomerAndType(companyCustomer, CompanyCustomerFileType.EvaluationForm).stream().map(v -> { + return findAllByCustomerAndType(companyCustomer, CustomerFileType.EvaluationForm).stream().map(v -> { return companyCustomerEvaluationFormFileRepository.findById(v.getId()).orElseGet(() -> { CompanyCustomerEvaluationFormFile formFile = new CompanyCustomerEvaluationFormFile(); formFile.setCustomerFile(v); @@ -181,7 +181,7 @@ public class CompanyCustomerFileService implements IEntityService files = findAllByCustomerAndType(companyCustomer, CompanyCustomerFileType.EvaluationForm); + List files = findAllByCustomerAndType(companyCustomer, CustomerFileType.EvaluationForm); CompanyCustomerFile latestFile = files.stream() .filter(v -> v.getSignDate() != null && v.isValid()) .max(Comparator.comparing(CompanyCustomerFile::getSignDate)) 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 4e0f01a..5eec906 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 @@ -31,7 +31,7 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import com.ecep.contract.CompanyCustomerFileType; +import com.ecep.contract.CustomerFileType; import com.ecep.contract.IEntityService; import com.ecep.contract.ds.company.service.CompanyBasicService; import com.ecep.contract.ds.customer.repository.CompanyCustomerEvaluationFormFileRepository; @@ -184,7 +184,7 @@ public class CompanyCustomerService extends CompanyBasicService @Override protected > boolean fillFileAsDefaultType(F dbFile, File file, Consumer status) { - dbFile.setType((T) CompanyCustomerFileType.General); + dbFile.setType((T) CustomerFileType.General); fillFile(dbFile, file, null, status); companyCustomerFileService.save((CompanyCustomerFile) dbFile); return true; @@ -254,7 +254,7 @@ public class CompanyCustomerService extends CompanyBasicService protected > F fillFileType(File file, List fileList, Consumer status) { CompanyCustomerFile customerFile = new CompanyCustomerFile(); - customerFile.setType(CompanyCustomerFileType.General); + customerFile.setType(CustomerFileType.General); if (fillFile(customerFile, file, fileList, status)) { return (F) customerFile; } @@ -264,8 +264,8 @@ public class CompanyCustomerService extends CompanyBasicService @Override protected > boolean setFileTypeAsEvaluationForm(F file) { T type = file.getType(); - if (type != CompanyCustomerFileType.EvaluationForm) { - file.setType((T) CompanyCustomerFileType.EvaluationForm); + if (type != CustomerFileType.EvaluationForm) { + file.setType((T) CustomerFileType.EvaluationForm); return true; } return false;