From 39dc3d6f7168eae8fda1b0fe6671be819d35c732 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 28 Sep 2023 11:10:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into wb
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java
index 998576e..86b05aa 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java
@@ -16,8 +16,11 @@
import com.moral.api.service.AllocationExtensionService;
import com.moral.api.service.AllocationService;
import com.moral.api.service.FileTableService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
/**
* <p>
@@ -30,11 +33,11 @@
@Service
public class AllocationExtensionServiceImpl extends ServiceImpl<AllocationExtensionMapper, AllocationExtension> implements AllocationExtensionService {
- private final AllocationService allocationService;
+ @Autowired
+ private AllocationService allocationService;
private final FileTableService fileTableService;
- public AllocationExtensionServiceImpl(AllocationService allocationService, FileTableService fileTableService) {
- this.allocationService = allocationService;
+ public AllocationExtensionServiceImpl( FileTableService fileTableService) {
this.fileTableService = fileTableService;
}
@@ -63,6 +66,8 @@
@Override
public Page<AllocationExtensionPageExt> extPage(AllocationExtensionPageCond allocationExtensionPageCond) {
+ List<Integer> unitList = allocationService.unitResult();
+ allocationExtensionPageCond.setUnitList(unitList);
return this.baseMapper.extPage(allocationExtensionPageCond.getPage().convertPage(), allocationExtensionPageCond);
}
@@ -73,16 +78,16 @@
@Override
@Transactional
- public boolean check(Integer id, Integer sate) {
+ public boolean check(Integer id, Integer state) {
AllocationExtensionExt extensionExt = this.baseMapper.extOne(id);
if(!AllocationExtensionApproveEnum.APPLYING.value.equals(extensionExt.getState())){
throw new BusinessException("������������������������������");
}
AllocationExtension allocationExtension = new AllocationExtension();
allocationExtension.setId(id);
- allocationExtension.setState(sate);
+ allocationExtension.setState(state);
this.baseMapper.updateById(allocationExtension);
- if(AllocationExtensionApproveEnum.PASS.value.equals(sate)){
+ if(AllocationExtensionApproveEnum.PASS.value.equals(state)){
Allocation allocation = new Allocation();
allocation.setAllocationId(extensionExt.getAllocationId());
allocation.setChangeDay(extensionExt.getChangeDay()+extensionExt.getExtensionNum());
--
Gitblit v1.8.0