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

refactor(vo): 重构VO对象结构，统一字段命名和接口实现

Browse Source 
重构所有VO对象，统一字段命名规范，移除冗余字段，优化接口实现
新增Voable接口用于VO对象转换
调整BaseViewModel和ProjectBasedViewModel接口定义
更新相关服务和控制器以适应VO对象变更
This commit is contained in:
宋其青
2025-09-21 17:47:52 +08:00
parent 07c3f39a95
commit 039d753bab
408 changed files with 6602 additions and 4800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
client/src/main/java/com/ecep/contract/vm/CurrentEmployee.java
View File

@@ -1,24 +1,12 @@
package com.ecep.contract.vm;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Locale;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
import com.ecep.contract.Desktop;
import com.ecep.contract.MyDateTimeUtils;
import com.ecep.contract.SpringApp;
import com.ecep.contract.controller.CurrentEmployeeInitialedEvent;
import com.ecep.contract.model.Employee;
import com.ecep.contract.model.EmployeeRole;
import com.ecep.contract.service.EmployeeService;
import com.ecep.contract.vo.EmployeeVo;
import javafx.application.Platform;
import javafx.beans.property.SimpleListProperty;
import javafx.beans.property.SimpleObjectProperty;
@@ -28,6 +16,16 @@ import javafx.util.converter.LocalDateStringConverter;
import javafx.util.converter.LocalDateTimeStringConverter;
import javafx.util.converter.NumberStringConverter;
import lombok.ToString;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Locale;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
/**
* 当前登录用户
@@ -81,7 +79,7 @@ public class CurrentEmployee extends EmployeeViewModel {
}
@Override
protected void updateFrom(Employee v) {
protected void updateFrom(EmployeeVo v) {
super.updateFrom(v);
// 根据用户的个人配置修改
@@ -142,8 +140,8 @@ public class CurrentEmployee extends EmployeeViewModel {
executorService.submit(() -> {
// issue #1 sss 2020-07-05
EmployeeService employeeService = SpringApp.getBean(EmployeeService.class);
Employee employee = employeeService.findById(Desktop.instance.getActiveEmployeeId());
List<EmployeeRole> roles = employeeService.getRolesByEmployeeId(employee.getId());
EmployeeVo employee = employeeService.findById(getId().get());
List<EmployeeRole> roles = employeeService.getRolesByEmployeeId(getId().get());
Platform.runLater(() -> {
update(employee);
rolesProperty().setAll(roles);