feat: 添加合同全量同步任务和合格供方名录路径生成功能
refactor: 重构查询服务使用ParamConstant替换ServiceConstant style: 清理无用代码和注释 fix: 修复CompanyCustomerEvaluationFormFileService查询方法 docs: 更新CloudYuVo和CompanyBankAccountVo字段注释
This commit is contained in:
@@ -6,6 +6,7 @@ import java.util.Objects;
|
||||
|
||||
import com.ecep.contract.vo.CloudYuVo;
|
||||
|
||||
import javafx.beans.property.SimpleBooleanProperty;
|
||||
import javafx.beans.property.SimpleIntegerProperty;
|
||||
import javafx.beans.property.SimpleObjectProperty;
|
||||
import javafx.beans.property.SimpleStringProperty;
|
||||
@@ -15,10 +16,6 @@ import lombok.EqualsAndHashCode;
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
public class CloudYuInfoViewModel extends IdentityViewModel<CloudYuVo> {
|
||||
/**
|
||||
* 云端Id
|
||||
*/
|
||||
private SimpleStringProperty cloudId = new SimpleStringProperty();
|
||||
/**
|
||||
* 公司ID
|
||||
*/
|
||||
@@ -28,15 +25,16 @@ public class CloudYuInfoViewModel extends IdentityViewModel<CloudYuVo> {
|
||||
*/
|
||||
private SimpleObjectProperty<LocalDateTime> latestUpdate = new SimpleObjectProperty<>();
|
||||
|
||||
private SimpleStringProperty vendorCode = new SimpleStringProperty();
|
||||
private SimpleStringProperty vendorClassCode = new SimpleStringProperty();
|
||||
private SimpleObjectProperty<LocalDate> vendorDevelopDate = new SimpleObjectProperty<>();
|
||||
private SimpleStringProperty exceptionMessage = new SimpleStringProperty();
|
||||
|
||||
private SimpleStringProperty customerCode = new SimpleStringProperty();
|
||||
private SimpleStringProperty customerClassCode = new SimpleStringProperty();
|
||||
private SimpleObjectProperty<LocalDate> customerDevelopDate = new SimpleObjectProperty<>();
|
||||
private SimpleObjectProperty<LocalDate> vendorUpdateDate = new SimpleObjectProperty<>();
|
||||
private SimpleObjectProperty<LocalDate> customerUpdateDate = new SimpleObjectProperty<>();
|
||||
|
||||
private SimpleObjectProperty<LocalDateTime> cloudLatest = new SimpleObjectProperty<>();
|
||||
/**
|
||||
* 是否激活
|
||||
*/
|
||||
private SimpleBooleanProperty active = new SimpleBooleanProperty();
|
||||
|
||||
/**
|
||||
* Version
|
||||
@@ -46,11 +44,13 @@ public class CloudYuInfoViewModel extends IdentityViewModel<CloudYuVo> {
|
||||
@Override
|
||||
protected void updateFrom(CloudYuVo info) {
|
||||
super.updateFrom(info);
|
||||
vendorCode.set(info.getExceptionMessage());
|
||||
vendorDevelopDate.set(info.getVendorUpdateDate());
|
||||
customerDevelopDate.set(info.getCustomerUpdateDate());
|
||||
company.set(info.getCompanyId());
|
||||
exceptionMessage.set(info.getExceptionMessage());
|
||||
vendorUpdateDate.set(info.getVendorUpdateDate());
|
||||
customerUpdateDate.set(info.getCustomerUpdateDate());
|
||||
cloudLatest.set(info.getCloudLatest());
|
||||
latestUpdate.set(info.getLatestUpdate());
|
||||
active.set(info.isActive());
|
||||
version.set(info.getVersion());
|
||||
}
|
||||
|
||||
@@ -65,16 +65,20 @@ public class CloudYuInfoViewModel extends IdentityViewModel<CloudYuVo> {
|
||||
|
||||
private boolean copyTo_(CloudYuVo info) {
|
||||
boolean modified = false;
|
||||
if (!Objects.equals(info.getExceptionMessage(), vendorCode.get())) {
|
||||
info.setExceptionMessage(vendorCode.get());
|
||||
if (!Objects.equals(info.getCompanyId(), company.get())) {
|
||||
info.setCompanyId(company.get());
|
||||
modified = true;
|
||||
}
|
||||
if (!Objects.equals(info.getVendorUpdateDate(), vendorDevelopDate.get())) {
|
||||
info.setVendorUpdateDate(vendorDevelopDate.get());
|
||||
if (!Objects.equals(info.getExceptionMessage(), exceptionMessage.get())) {
|
||||
info.setExceptionMessage(exceptionMessage.get());
|
||||
modified = true;
|
||||
}
|
||||
if (!Objects.equals(info.getCustomerUpdateDate(), customerDevelopDate.get())) {
|
||||
info.setCustomerUpdateDate(customerDevelopDate.get());
|
||||
if (!Objects.equals(info.getVendorUpdateDate(), vendorUpdateDate.get())) {
|
||||
info.setVendorUpdateDate(vendorUpdateDate.get());
|
||||
modified = true;
|
||||
}
|
||||
if (!Objects.equals(info.getCustomerUpdateDate(), customerUpdateDate.get())) {
|
||||
info.setCustomerUpdateDate(customerUpdateDate.get());
|
||||
modified = true;
|
||||
}
|
||||
|
||||
@@ -86,6 +90,10 @@ public class CloudYuInfoViewModel extends IdentityViewModel<CloudYuVo> {
|
||||
info.setLatestUpdate(latestUpdate.get());
|
||||
modified = true;
|
||||
}
|
||||
if (!Objects.equals(info.isActive(), active.get())) {
|
||||
info.setActive(active.get());
|
||||
modified = true;
|
||||
}
|
||||
if (!Objects.equals(info.getVersion(), version.get())) {
|
||||
info.setVersion(version.get());
|
||||
modified = true;
|
||||
|
||||
Reference in New Issue
Block a user