From 28923b3d67c58b032bc4ff128aa1d5e62d73dba1 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 02 Feb 2024 10:07:58 +0800
Subject: [PATCH] fix:提交实时在线率接口

---
 screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java |   76 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 73 insertions(+), 3 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 ca0b58c..99cc3d0 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
@@ -2,14 +2,26 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.entity.Allocation;
 import com.moral.api.entity.AllocationExtension;
+import com.moral.api.exception.BusinessException;
 import com.moral.api.mapper.AllocationExtensionMapper;
+import com.moral.api.pojo.enums.AllocationExtensionApproveEnum;
+import com.moral.api.pojo.enums.FileTableEnum;
+import com.moral.api.pojo.ext.allocation.AllocationExt;
 import com.moral.api.pojo.ext.allocationextension.AllocationExtensionExt;
 import com.moral.api.pojo.ext.allocationextension.AllocationExtensionPageExt;
 import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;
 import com.moral.api.pojo.query.allocationextension.AllocationExtensionPageCond;
 import com.moral.api.service.AllocationExtensionService;
+import com.moral.api.service.AllocationService;
+import com.moral.api.service.FileTableService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * <p>
@@ -22,19 +34,53 @@
 @Service
 public class AllocationExtensionServiceImpl extends ServiceImpl<AllocationExtensionMapper, AllocationExtension> implements AllocationExtensionService {
 
-   // private final All
+    @Autowired
+    private AllocationService allocationService;
+    private final FileTableService fileTableService;
+
+    public AllocationExtensionServiceImpl( FileTableService fileTableService) {
+        this.fileTableService = fileTableService;
+    }
 
 
     @Override
     public AllocationExtensionExt extOne(Integer id) {
-        return this.baseMapper.extOne(id);
+        AllocationExtensionExt extensionExt = this.baseMapper.extOne(id);
+        AllocationExt extOne = allocationService.oneAllocation(extensionExt.getAllocationId());
+        extensionExt.setAllocationNum(extOne.getAllocationNum())
+                    .setEscalationTime(extOne.getEscalationTime())
+                    .setPollutePosition(extOne.getPollutePosition())
+                    .setUnitId(extOne.getUnitId())
+                    .setPolluteType(extOne.getPolluteType())
+                    .setChangeType(extOne.getChangeType())
+                    .setChangeDay(extOne.getChangeDay())
+                    .setEscalationName(extOne.getEscalationName())
+                    .setInvestigationType(extOne.getInvestigationType())
+                    .setProblemDescribe(extOne.getProblemDescribe())
+                    .setEscalationUnitId(extOne.getEscalationUnitId());
+        extensionExt.setFileBaseList(fileTableService.list(extensionExt.getAllocationId(), FileTableEnum.ALLOCATION_FOUNDATION.value));
+        extensionExt.setFileList(fileTableService.list(id, FileTableEnum.ALLOCATION_EXTENSION.value));
+        return extensionExt;
     }
 
 
 
     @Override
     public Page<AllocationExtensionPageExt> extPage(AllocationExtensionPageCond allocationExtensionPageCond) {
-        return this.baseMapper.extPage(allocationExtensionPageCond.getPage().convertPage(), allocationExtensionPageCond);
+        List<Integer> unitList = allocationService.unitResult();
+        allocationExtensionPageCond.setUnitList(unitList);
+        Integer codeId =  allocationService.unitAreaCode();
+        Page<AllocationExtensionPageExt> page =  this.baseMapper.extPage(allocationExtensionPageCond.getPage().convertPage(), allocationExtensionPageCond);
+        if(CollectionUtils.isNotEmpty(page.getRecords())){
+            page.getRecords().forEach(it->{
+                if((CollectionUtils.isEmpty(unitList)&&codeId.equals(1))||codeId.equals(2)){
+                    it.setIsApprove(1);
+                }else {
+                    it.setIsApprove(0);
+                }
+            });
+        }
+        return page;
     }
 
     @Override
@@ -42,5 +88,29 @@
         return this.save(allocationExtensionAddCond.convert());
     }
 
+    @Override
+    @Transactional
+    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(state);
+        this.baseMapper.updateById(allocationExtension);
+        if(AllocationExtensionApproveEnum.PASS.value.equals(state)){
+            Allocation allocation = new Allocation();
+            allocation.setAllocationId(extensionExt.getAllocationId());
+            allocation.setChangeDay(extensionExt.getChangeDay()+extensionExt.getExtensionNum());
+            allocationService.updateById(allocation);
+        }
+        return true;
+    }
+
+
+
 
 }
+
+

--
Gitblit v1.8.0