From 4fe7e7418e7a89b82f676a72fcc28c3d9e5f6f3e Mon Sep 17 00:00:00 2001
From: liaoxuwei <5789413@qq.com>
Date: Mon, 29 Jan 2024 14:37:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AA=97=E5=8F=A3=E8=80=83?=
=?UTF-8?q?=E6=A0=B8=E6=97=B6=E5=86=99=E5=85=A5=E7=AA=97=E5=8F=A3=E5=90=8D?=
=?UTF-8?q?=E7=A7=B0=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/WindowPerformServiceImpl.java | 10 ++++++++++
.../impl/WindowWorkmanPerformServiceImpl.java | 15 +++++++++++----
2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowPerformServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowPerformServiceImpl.java
index 82d23f93..e933a7a4 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowPerformServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowPerformServiceImpl.java
@@ -13,6 +13,7 @@ import com.mortals.xhx.module.staff.model.StaffEntity;
import com.mortals.xhx.module.staff.service.StaffService;
import com.mortals.xhx.module.window.model.*;
import com.mortals.xhx.module.window.model.vo.WindowPerformAllVo;
+import com.mortals.xhx.module.window.service.WindowOwnerDetailService;
import com.mortals.xhx.module.window.service.WindowWorkmanPerformService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
@@ -46,6 +47,8 @@ public class WindowPerformServiceImpl extends AbstractCRUDServiceImpl<WindowPerf
private WindowWorkmanPerformService windowWorkmanPerformService;
@Autowired
private StaffService staffService;
+ @Autowired
+ private WindowOwnerDetailService windowOwnerDetailService;
@Override
@@ -58,6 +61,13 @@ public class WindowPerformServiceImpl extends AbstractCRUDServiceImpl<WindowPerf
entity.setSalaId(staff.getSalaId());
entity.setSalaName(staff.getSalaName());
}
+ if(entity.getWindowId()!=null) {
+ WindowOwnerDetailEntity windowOwnerDetailEntity = windowOwnerDetailService.selectOne(new WindowOwnerDetailQuery().windowId(entity.getWindowId()));
+ if(windowOwnerDetailEntity!=null){
+ entity.setWindowCode(windowOwnerDetailEntity.getWindowCode());
+ entity.setWindowName(windowOwnerDetailEntity.getWindowName());
+ }
+ }
deleteExistBill(entity, context);
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowWorkmanPerformServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowWorkmanPerformServiceImpl.java
index c656c2b9..09eff86c 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowWorkmanPerformServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowWorkmanPerformServiceImpl.java
@@ -14,8 +14,8 @@ import com.mortals.xhx.module.check.service.CheckWindowPerformService;
import com.mortals.xhx.module.check.service.CheckWindowWorkmanPerformService;
import com.mortals.xhx.module.staff.model.StaffEntity;
import com.mortals.xhx.module.staff.service.StaffService;
-import com.mortals.xhx.module.window.model.WindowWorkmanPerformDetailEntity;
-import com.mortals.xhx.module.window.model.WindowWorkmanPerformDetailQuery;
+import com.mortals.xhx.module.window.model.*;
+import com.mortals.xhx.module.window.service.WindowOwnerDetailService;
import com.mortals.xhx.module.window.service.WindowWorkmanPerformDetailService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
@@ -25,7 +25,6 @@ import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.xhx.module.window.dao.WindowWorkmanPerformDao;
-import com.mortals.xhx.module.window.model.WindowWorkmanPerformEntity;
import com.mortals.xhx.module.window.service.WindowWorkmanPerformService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.ObjectUtils;
@@ -51,7 +50,8 @@ public class WindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImpl<Win
private CheckWindowWorkmanPerformService checkWindowWorkmanPerformService;
@Autowired
private StaffService staffService;
-
+ @Autowired
+ private WindowOwnerDetailService windowOwnerDetailService;
@Autowired
private IWindowFeign windowFeign;
@@ -67,6 +67,13 @@ public class WindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImpl<Win
entity.setSalaId(staff.getSalaId());
entity.setSalaName(staff.getSalaName());
}
+ if(entity.getWindowId()!=null) {
+ WindowOwnerDetailEntity windowOwnerDetailEntity = windowOwnerDetailService.selectOne(new WindowOwnerDetailQuery().windowId(entity.getWindowId()));
+ if(windowOwnerDetailEntity!=null){
+ entity.setWindowCode(windowOwnerDetailEntity.getWindowCode());
+ entity.setWindowName(windowOwnerDetailEntity.getWindowName());
+ }
+ }
super.saveBefore(entity, context);
}
--
2.24.3