From c64ca12b8679d73fc7f8109f0e08fa8c74352164 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Nov 2023 12:46:39 +0800
Subject: [PATCH] chore:补充提交

---
 screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java |   33 +++++++++++++++++++++++++--------
 1 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
index 2f4eace..0b9da91 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
@@ -127,7 +127,7 @@
         //������
         String allocationNum = "JBD-" + dateString + String.format("%04d", i);
         allocation.setAllocationNum(allocationNum);
-        if(Objects.nonNull(allocationCond.getEscalationUnitId())&& escalationType(allocationCond.getEscalationUnitId())) {
+        if(Objects.nonNull(allocationCond.getEscalationUnitId())&& !allocationCond.getEscalationUnitId().equals(allocationCond.getUnitId()) && escalationType(allocationCond.getEscalationUnitId())) {
             allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
         }
         if(NEW_BUILT.equals(allocationCond.getState())) {
@@ -138,7 +138,7 @@
         //������������
         userService.pushOneUser(allocation);
         redisTemplate.opsForValue().set(RedisConstants.JBD_DATA,i);
-        if(NEW_BUILT.equals(allocationCond.getState())) {
+        if(NEW_BUILT.equals(allocationCond.getState())||AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(allocationCond.getState())) {
             //������������������
             ApproveTable approveTable = new ApproveTable();
             approveTable.setRelationId(allocation.getAllocationId());
@@ -508,6 +508,9 @@
         allocationExt.setFileChangeList(fileTableService.list(id,FileTableEnum.ALLOCATION_RECTIFICATION.value));
         allocationExt.setFileApproveList(fileTableService.list(id,FileTableEnum.ALLOCATION_APPROVE.value));
         allocationExt.setApproveList(approveTableService.listAll(id, FileTableEnum.ALLOCATION_FOUNDATION.value));
+        allocationExt.setUnitName(getUnitName(allocationExt.getUnitId()).getUnitName());
+        allocationExt.setEscalationUnitName(getUnitName(allocationExt.getEscalationUnitId()).getUnitName());
+        allocationExt.setPolluteTypeName(responsibilityUnitMapper.selectName(Constants.WU_RAN_LEI_XING,allocationExt.getPolluteType()));
         return allocationExt;
     }
 
@@ -708,6 +711,8 @@
         Page<AllocationPageExt> extAppPage = this.baseMapper.extAppPage(allocationPageCond.getPage().convertPage(),allocationPageCond);
         extAppPage.getRecords().forEach(it->{
             Integer state = it.getState();
+            //������������������������
+            it.setEscalationUnitName(getUnitName(it.getEscalationUnitId()).getUnitName());
             if (state.equals(AllocationApproveEnum.DRAFT.value)||state.equals(AllocationApproveEnum.UNDER_RECTIFICATION.value)){
                 if(integer==0||integer==1){
                     it.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
@@ -795,10 +800,10 @@
         //������������������
         ApproveTable approveTable = new ApproveTable();
         approveTable.setRelationId(allocation.getAllocationId());
-        approveTable.setState(NEW_BUILT);
         approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
+       /* approveTable.setState(NEW_BUILT);
         approveTable.setStateName("������");
-        approveTableService.saveResult(approveTable);
+        approveTableService.saveResult(approveTable);*/
         approveTable.setState(AllocationApproveEnum.UNDER_RECTIFICATION.value);
         approveTable.setStateName(AllocationApproveEnum.UNDER_RECTIFICATION.name);
         approveTableService.saveResult(approveTable);
@@ -861,8 +866,13 @@
         List<Integer> userList = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_JBD.getValue(),user.getUserId());
         if(CollectionUtils.isNotEmpty(userList)){
             //���������������������
-            appAuthority.setCode(1);
-            appAuthority.setName(AppAllocationStateEnum.COMPLETED.name);
+            if (allocation.getState()>30){
+                appAuthority.setCode(2);
+                appAuthority.setName(AppAllocationStateEnum.COMPLETED.name);
+            }else {
+                appAuthority.setCode(1);
+                appAuthority.setName(AppAllocationStateEnum.COMPLETED.name);
+            }
             return appAuthority;
         }
         if(Objects.nonNull(user.getUnitId())&&user.getUnitId()!=0){
@@ -877,7 +887,7 @@
                     appAuthority.setName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
                     return appAuthority;
                 }else {
-                    appAuthority.setCode(1);
+                    appAuthority.setCode(2);
                     appAuthority.setName(AppAllocationStateEnum.COMPLETED.name);
                     return appAuthority;
                 }
@@ -891,7 +901,7 @@
                     appAuthority.setName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
                     return appAuthority;
                 }else {
-                    appAuthority.setCode(1);
+                    appAuthority.setCode(2);
                     appAuthority.setName(AppAllocationStateEnum.COMPLETED.name);
                     return appAuthority;
                 }
@@ -943,4 +953,11 @@
         }
         return f;
     }
+
+
+    private ResponsibilityUnit getUnitName(Integer unitId){
+        ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(unitId);
+          return   responsibilityUnit;
+    }
+
 }

--
Gitblit v1.8.0