From 17c774c9c13febdcff654ffd6bbabd313c37a3ee Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 20 Oct 2023 09:24:09 +0800
Subject: [PATCH] chore:补充提交

---
 screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java |  462 ++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 262 insertions(+), 200 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 2d6afe9..7c8898d 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
@@ -1,5 +1,6 @@
 package com.moral.api.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.moral.api.config.Interceptor.UserHelper;
@@ -10,10 +11,9 @@
 import com.moral.api.pojo.ext.allocation.AllocationExt;
 import com.moral.api.pojo.ext.allocation.AllocationListExt;
 import com.moral.api.pojo.ext.allocation.AllocationPageExt;
-import com.moral.api.pojo.query.PageCond;
 import com.moral.api.pojo.query.allocation.*;
 import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;
-import com.moral.api.pojo.vo.approvetable.ApproveTableListVo;
+import com.moral.api.pojo.vo.allocation.AllocationFindVo;
 import com.moral.api.pojo.vo.user.QxUser;
 import com.moral.api.service.AllocationExtensionService;
 import com.moral.api.service.ApproveTableService;
@@ -62,12 +62,14 @@
 import com.moral.constant.RedisConstants;
 import com.moral.util.DateUtils;
 import com.moral.util.TokenUtils;
+import com.sun.javafx.scene.control.skin.VirtualFlow;
 
 
 @Service
 @Slf4j
 public class AllocationServiceImpl extends ServiceImpl<AllocationMapper, Allocation> implements AllocationService {
 
+    private final Integer NEW_BUILT = 10;
     @Autowired
     private SysDictTypeMapper sysDictTypeMapper;
     @Autowired
@@ -138,63 +140,32 @@
         allocation.setEscalationType(AllocationEscalationTypeEnum.SELF.getValue());
         String dateString = DateUtils.dateToDateString(new Date(), DateUtils.yyyyMMdd_EN);
         Object o = redisTemplate.opsForValue().get(RedisConstants.JBD_DATA);
-        int i;
-        if (ObjectUtils.isEmpty(o)){
-             i = 1;
-        }else {
-             i = Integer.parseInt(o.toString()) + 1;
-        }
+        int i = ObjectUtils.isEmpty(o)?1:Integer.parseInt(o.toString()) + 1;
         //������
         String allocationNum = "JBD-" + dateString + String.format("%04d", i);
         allocation.setAllocationNum(allocationNum);
         if(Objects.nonNull(allocationCond.getEscalationUnitId())&&allocationCond.getEscalationUnitId().toString().length()==6) {
             allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
         }
-        if(AllocationApproveEnum.NEW_BUILT.value.equals(allocationCond.getState())) {
+        if(NEW_BUILT.equals(allocationCond.getState())) {
             allocation.setState(AllocationApproveEnum.UNDER_RECTIFICATION.value);
         }
         //������������������
         allocationMapper.insert(allocation);
         redisTemplate.opsForValue().set(RedisConstants.JBD_DATA,i);
-        if(AllocationApproveEnum.NEW_BUILT.value.equals(allocationCond.getState())) {
+        if(NEW_BUILT.equals(allocationCond.getState())) {
             //������������������
             ApproveTable approveTable = new ApproveTable();
             approveTable.setRelationId(allocation.getAllocationId());
-            approveTable.setState(AllocationApproveEnum.NEW_BUILT.value);
+            approveTable.setState(NEW_BUILT);
             approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
-            approveTable.setStateName(AllocationApproveEnum.NEW_BUILT.name);
+            approveTable.setStateName("������");
             approveTableService.saveResult(approveTable);
         }
         fileTableService.upDateResult(allocationCond.getFileBaseList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_FOUNDATION.value);
         return allocation.getAllocationId();
     }
 
-    /**
-     * ������������
-     * @param id
-     * @return
-     */
-    @Override
-    public AllocationUnitDto check(Integer id) {
-        AllocationUnitDto allocationUnitDto = new AllocationUnitDto();
-        Allocation allocation = allocationMapper.selectById(id);
-        BeanUtils.copyProperties(allocation,allocationUnitDto);
-        ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(allocation.getUnitId());
-        allocationUnitDto.setUnitName(responsibilityUnit.getUnitName());
-        allocationUnitDto.setEscalationUnitName(responsibilityUnit.getUnitName());
-        Map<String, List<SysDictData>> map = (Map<String, List<SysDictData>>) redisTemplate.opsForValue().get(RedisConstants.DICT_DATA_KEY);
-        List<SysDictData> contaminate = map.get("contaminate");
-        for (SysDictData sysDictData : contaminate) {
-            if (sysDictData.getDataKey().equals(allocation.getPolluteType().toString())){
-                allocationUnitDto.setPolluteTypeName(sysDictData.getDataValue());
-                break;
-            }
-        }
-        allocationUnitDto.setChangeTypeName(allocation.getChangeType()==0?"������������":"������������");
-        allocationUnitDto.setInvestigationTypeName(allocation.getChangeType()==0?"������":"���������");
-        //������������
-        return allocationUnitDto;
-    }
 
     /**
      * ���������������
@@ -212,16 +183,16 @@
         if(Objects.nonNull(allocationUpdateCond.getEscalationUnitId())&&allocationUpdateCond.getEscalationUnitId().toString().length()==6) {
             allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
         }
-        if(AllocationApproveEnum.NEW_BUILT.value.equals(allocationUpdateCond.getState())) {
+        if(NEW_BUILT.equals(allocationUpdateCond.getState())) {
             //������������������
             ApproveTable approveTable = new ApproveTable();
             approveTable.setRelationId(allocation.getAllocationId());
-            approveTable.setState(AllocationApproveEnum.NEW_BUILT.value);
+            approveTable.setState(NEW_BUILT);
             approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
-            approveTable.setStateName(AllocationApproveEnum.NEW_BUILT.name);
+            approveTable.setStateName("������");
             approveTableService.saveResult(approveTable);
         }
-        if(AllocationApproveEnum.NEW_BUILT.value.equals(allocationUpdateCond.getState())) {
+        if(NEW_BUILT.equals(allocationUpdateCond.getState())) {
             allocation.setState(AllocationApproveEnum.UNDER_RECTIFICATION.value);
         }
         fileTableService.upDateResult(allocationUpdateCond.getFileBaseList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_FOUNDATION.value);
@@ -229,67 +200,7 @@
     }
 
 
-    /**
-     * ������������������
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Allocation> selectAll(Map<String, Object> map) {
 
-        Object unitId = map.get("unitId");
-        Object state = map.get("state");
-        Object polluteType = map.get("polluteType");
-        Object investigationType = map.get("investigationType");
-        Object changeType = map.get("changeType");
-        Object escalationTime = map.get("escalationTime");
-        Object isInvalid = map.get("isInvalid");
-//        int page = Integer.parseInt(map.get("page").toString());
-//        int size = Integer.parseInt(map.get("size").toString());
-        QueryWrapper<Allocation> wrapper = new QueryWrapper<>();
-
-        //������������
-        if (!ObjectUtils.isEmpty(unitId)){
-            wrapper.eq("unit_id",Integer.parseInt(unitId.toString()));
-        }
-        //������������
-        if (!ObjectUtils.isEmpty(state)){
-            wrapper.eq("state",Integer.parseInt(state.toString()));
-        }
-        //������������
-        if (!ObjectUtils.isEmpty(polluteType)){
-            wrapper.eq("pollute_type",Integer.parseInt(polluteType.toString()));
-        }
-        //������������
-        if (!ObjectUtils.isEmpty(investigationType)){
-            wrapper.eq("investigation_type",Integer.parseInt(investigationType.toString()));
-        }
-        //������������
-        if (!ObjectUtils.isEmpty(changeType)){
-            wrapper.eq("change_type",Integer.parseInt(changeType.toString()));
-        }
-        //������������
-        if (!ObjectUtils.isEmpty(isInvalid)){
-            wrapper.eq("is_invalid",Integer.parseInt(isInvalid.toString()));
-        }
-        if (!ObjectUtils.isEmpty(escalationTime)){
-//            wrapper.eq("is_invalid",Integer.parseInt(isInvalid.toString()));
-        }
-        List<Allocation> allocations = allocationMapper.selectList(wrapper);
-        ArrayList<AllocationUnitDto> rsList = new ArrayList<>();
-        for (Allocation allocation : allocations) {
-            AllocationUnitDto allocationUnitDto = new AllocationUnitDto();
-            BeanUtils.copyProperties(allocation,allocationUnitDto);
-            allocation.getEscalationTime();
-            Date dateOfDay = DateUtils.getDateOfDay(allocation.getEscalationTime(), allocation.getChangeDay());
-            Date date = new Date();
-            //���������������������������
-            int days = DateUtils.getDays(dateOfDay, date);
-            allocationUnitDto.setChangeDay(days);
-            rsList.add(allocationUnitDto);
-        }
-        return null;
-    }
 
 
     /**
@@ -301,73 +212,65 @@
     public Map<String, Object> selectUnitView(Map<String, Object> map) {
         QueryWrapper<Allocation> wrapper = new QueryWrapper<>();
         //������������������
-        Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
-        Object unitId = userInfo.get("unitId");
-        Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
-        Integer orgId = (Integer) orgInfo.get("id");
-//        Integer unitId= 17;
-        if (ObjectUtils.isEmpty(unitId)){
-            return null;
-        }
-
+        List<Integer> list = this.unitResult();
         if (!ObjectUtils.isEmpty(map.get("unitId"))){
             wrapper.in("unit_id",map.get("unitId").toString());
         }else {
-            if (orgId!=24){
-                ResponsibilityUnit responsibilityUnit1 = responsibilityUnitMapper.selectById(Integer.parseInt(unitId.toString()));
-                Integer areaCode = responsibilityUnit1.getAreaCode();
-                List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitService.selectUnit(areaCode);
-                if (ObjectUtils.isEmpty(responsibilityUnits)){
-                    List<ResponsibilityUnit> responsibilityUnits1 = responsibilityUnitService.selectAreaUnit(areaCode);
-                    Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits1.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
-                    List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
-                    wrapper.in("unit_id",collect1);
+            if (!ObjectUtils.isEmpty(list)){
+                Integer integer = list.get(0);
+                if (integer==0){
+                    return null;
                 }else {
-                    Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
-                    List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
-                    wrapper.in("unit_id",collect1);
+                    wrapper.in("unit_id",list);
                 }
             }
         }
 
+//        Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
+//        Object unitId = userInfo.get("unitId");
+//        Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
+//        Integer orgId = (Integer) orgInfo.get("id");
+//        if (!ObjectUtils.isEmpty(map.get("unitId"))){
+//            wrapper.in("unit_id",map.get("unitId").toString());
+//        }else {
+//            if (orgId!=24){
+//                if (ObjectUtils.isEmpty(unitId)){
+//                    return null;
+//                }
+//                ResponsibilityUnit responsibilityUnit1 = responsibilityUnitMapper.selectById(Integer.parseInt(unitId.toString()));
+//                Integer areaCode = responsibilityUnit1.getAreaCode();
+//                List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitService.selectUnit(areaCode);
+//                if (ObjectUtils.isEmpty(responsibilityUnits)){
+//                    List<ResponsibilityUnit> responsibilityUnits1 = responsibilityUnitService.selectAreaUnit(areaCode);
+//                    Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits1.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
+//                    List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
+//                    wrapper.in("unit_id",collect1);
+//                }else {
+//                    Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
+//                    List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
+//                    wrapper.in("unit_id",collect1);
+//                }
+//            }
+//        }
+
         HashMap<String, Object> rsMap = new HashMap<>();
-//        HashMap<String, Object> polluteMap = new HashMap<>();
         ArrayList<Map<String, Object>> polluteArrayList = new ArrayList<>();
         ArrayList<Map<String, Object>> escalationTypeList = new ArrayList<>();
-
-
         ArrayList<AllocationUnitViewDto> allocationUnitViewDtos = new ArrayList<>();
 
         Object number1 = map.get("number");
         String startTime=null;
         String endTime=null;
-        if (!ObjectUtils.isEmpty(map.get("startTime")) || !ObjectUtils.isEmpty(map.get("startTime"))){
+        if (!ObjectUtils.isEmpty(map.get("startTime")) || !ObjectUtils.isEmpty(map.get("endTime"))){
              startTime = map.get("startTime").toString();
              endTime = map.get("endTime").toString();
 
         }
         if (!ObjectUtils.isEmpty(number1)){
             String s = "-"+number1;
-            //���������������
+            //������������������
             endTime = DateUtils.getCurDateTime();
-            if (s.equals("-1")){
-                //���������������
-                 startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
-            }
-            if (s.equals("-2")){
-                //���������������
-                startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
-            }
-            if (s.equals("-3")){
-                startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
-            }
-            if (s.equals("-6")){
-                startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
-            }
-            if (s.equals("-12")){
-                startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
-            }
-
+            startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
         }
 
         wrapper.between("escalation_time",startTime,endTime);
@@ -383,7 +286,7 @@
             String state = allocation.getState()+"";
             if (state.equals("40")||state.equals("50")){
                  complete++;
-            }else if(state.equals("10")||state.equals("20") ||state.equals("30")) {
+            }else  {
                  unComplete++;
             }
         }
@@ -406,7 +309,6 @@
         Map<Integer, List<Allocation>> polluteTypeMap = allocations.stream().collect(Collectors.groupingBy(o -> o.getPolluteType()));
         Set<Integer> polluteTypes = polluteTypeMap.keySet();
         for (Integer polluteType : polluteTypes) {
-
             HashMap<String, Object> typeMap = new HashMap<>();
             List<Allocation> allocations1 = polluteTypeMap.get(polluteType);
             QueryWrapper<SysDictData> sysDictDataQueryWrapper = new QueryWrapper<>();
@@ -415,7 +317,6 @@
             SysDictData sysDictData = sysDictDataMapper.selectOne(sysDictDataQueryWrapper);
             typeMap.put("name",sysDictData.getDataValue());
             typeMap.put("value",allocations1.size());
-//            polluteMap.put("polluteType",typeMap);
             polluteArrayList.add(typeMap);
         }
         //������������������������
@@ -426,9 +327,7 @@
         for (Integer integer : unitList) {
             //������������
             ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(integer);
-
             SysArea areaByCode = sysAreaService.getAreaByCode(responsibilityUnit.getAreaCode());
-
             AllocationUnitViewDto allocationUnitViewDto = new AllocationUnitViewDto();
             List<Allocation> allocations1 = unitMap.get(integer);
             //������
@@ -444,7 +343,7 @@
                     Date dateOfDay = DateUtils.getDateOfDay(allocation.getEscalationTime(), allocation.getChangeDay());
                     Date date = new Date();
                     boolean timeBefor = DateUtils.isTimeBefor(date, dateOfDay);
-                    if (timeBefor && !state.equals("40") && !state.equals("50")){
+                    if (timeBefor && !state.equals("40") && !state.equals("50") && !state.equals("9")){
                         //������������
                         overdue++;
                     }
@@ -473,9 +372,9 @@
         rsMap.put("unitView",allocationUnitViewDtos);
         //������
         rsMap.put("total",allocations.size());
-        //���������
+        //���������
         rsMap.put("complete",complete);
-        //������������
+        //���������
         rsMap.put("unComplete",unComplete);
         //������
         rsMap.put("overdue",overdue);
@@ -496,61 +395,57 @@
     public List<Map<String, Object>> unitExel(Map<String, Object> map) {
         QueryWrapper<Allocation> wrapper = new QueryWrapper<>();
         //������������������
-        Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
-        Object unitId = userInfo.get("unitId");
-        Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
-        Integer orgId = (Integer) orgInfo.get("id");
-
-        if (ObjectUtils.isEmpty(unitId)){
-            return null;
-        }
-        if (orgId!=24){
-            ResponsibilityUnit responsibilityUnit1 = responsibilityUnitMapper.selectById(Integer.parseInt(unitId.toString()));
-            Integer areaCode = responsibilityUnit1.getAreaCode();
-            List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitService.selectUnit(areaCode);
-            if (ObjectUtils.isEmpty(responsibilityUnits)){
-                List<ResponsibilityUnit> responsibilityUnits1 = responsibilityUnitService.selectAreaUnit(areaCode);
-                Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits1.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
-                List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
-                wrapper.in("unit_id",collect1);
-            }else {
-                Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
-                List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
-                wrapper.in("unit_id",collect1);
+        List<Integer> list = this.unitResult();
+        if (!ObjectUtils.isEmpty(map.get("unitId"))){
+            wrapper.in("unit_id",map.get("unitId").toString());
+        }else {
+            if (!ObjectUtils.isEmpty(list)){
+                Integer integer = list.get(0);
+                if (integer==0){
+                    return null;
+                }else {
+                    wrapper.in("unit_id",list);
+                }
             }
         }
+//        Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
+//        Object unitId = userInfo.get("unitId");
+//        Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
+//        Integer orgId = (Integer) orgInfo.get("id");
+//
+//        if (ObjectUtils.isEmpty(unitId)){
+//            return null;
+//        }
+//        if (orgId!=24){
+//            ResponsibilityUnit responsibilityUnit1 = responsibilityUnitMapper.selectById(Integer.parseInt(unitId.toString()));
+//            Integer areaCode = responsibilityUnit1.getAreaCode();
+//            List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitService.selectUnit(areaCode);
+//            if (ObjectUtils.isEmpty(responsibilityUnits)){
+//                List<ResponsibilityUnit> responsibilityUnits1 = responsibilityUnitService.selectAreaUnit(areaCode);
+//                Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits1.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
+//                List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
+//                wrapper.in("unit_id",collect1);
+//            }else {
+//                Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
+//                List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
+//                wrapper.in("unit_id",collect1);
+//            }
+//        }
 
         ArrayList<Map<String, Object>> rsMap = new ArrayList<>();
         Object number1 = map.get("number");
         String startTime=null;
         String endTime=null;
-        if (!ObjectUtils.isEmpty(map.get("startTime")) || !ObjectUtils.isEmpty(map.get("startTime"))){
+        if (!ObjectUtils.isEmpty(map.get("startTime")) || !ObjectUtils.isEmpty(map.get("endTime"))){
             startTime = map.get("startTime").toString();
             endTime = map.get("endTime").toString();
 
         }
         if (!ObjectUtils.isEmpty(number1)){
             String s = "-"+number1;
-            //���������������
+            //������������������
             endTime = DateUtils.getCurDateTime();
-            if (s.equals("-1")){
-                //���������������
-
-                startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
-            }
-            if (s.equals("-2")){
-                //���������������
-                startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
-            }
-            if (s.equals("-3")){
-                startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
-            }
-            if (s.equals("-6")){
-                startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
-            }
-            if (s.equals("-12")){
-                startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
-            }
+            startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
 
         }
         wrapper.between("escalation_time",startTime,endTime);
@@ -568,11 +463,8 @@
             LinkedHashMap<String, Object> map1 = new LinkedHashMap<>();
             //������������
             ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(integer);
-
             SysArea areaByCode = sysAreaService.getAreaByCode(responsibilityUnit.getAreaCode());
-
             List<Allocation> allocations1 = unitMap.get(integer);
-
             //������
             int marks=0;
             //������
@@ -608,8 +500,19 @@
     @Override
     public Page<AllocationPageExt> extPage(AllocationPageCond allocationPageCond) {
         List<Integer> unitList = unitResult();
+        Integer codeId =  unitAreaCode();
         allocationPageCond.setUnitList(unitList);
-        return this.baseMapper.extPage(allocationPageCond.getPage().convertPage(), allocationPageCond);
+        Page<AllocationPageExt> page =  this.baseMapper.extPage(allocationPageCond.getPage().convertPage(), allocationPageCond);
+        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
@@ -727,16 +630,157 @@
         }
         AllocationExtension allocationExtension = allocationExtensionAddCond.convert();
         allocationExtension.setState(AllocationExtensionApproveEnum.APPLYING.value);
+        allocationExtension.setExtensionOldNum(allocationExt.getChangeDay());
         allocationExtensionService.save(allocationExtension);
         fileTableService.upDateResult(allocationExtensionAddCond.getFileList(),allocationExtension.getId(), FileTableEnum.ALLOCATION_EXTENSION.value);
         return true;
     }
 
     @Override
+    public List<AllocationFindVo> selectSmallRoutine(Integer state,String startTime,String endTime) {
+        ArrayList<AllocationFindVo> allocationFindVos = new ArrayList<>();
+        LambdaQueryWrapper<Allocation> wrapper = new LambdaQueryWrapper<>();
+        //������������������
+        List<Integer> list = unitResult();
+        if (!ObjectUtils.isEmpty(list)){
+            Integer integer = list.get(0);
+            if (integer==0){
+                return null;
+            }else {
+                wrapper.in(Allocation::getUnitId,list);
+            }
+        }
+        Integer integer = unitAreaCode();
+        //��������������� ���������
+        if (integer==0 || integer==1){
+            if (state==3){
+                wrapper.in(Allocation::getState,40,50);
+            }else if (state==2){
+                wrapper.eq(Allocation::getState,30);
+            }else if (state==1){
+                wrapper.eq(Allocation::getState,20);
+            }
+        //������������
+        }else if (integer==2){
+            if (state==3){
+                wrapper.in(Allocation::getState,40,50);
+            }else if (state==2){
+                wrapper.eq(Allocation::getState,20);
+            }else if (state==1){
+                wrapper.eq(Allocation::getState,30);
+            }
+        }
+        if (!ObjectUtils.isEmpty(startTime) && !ObjectUtils.isEmpty(endTime)){
+            wrapper.between(Allocation::getEscalationTime,startTime,endTime);
+        }
+        wrapper.eq(Allocation::getIsDel,0).eq(Allocation::getIsInvalid,0);
+        wrapper.orderByDesc(Allocation::getEscalationTime);
+        List<Allocation> allocations = allocationMapper.selectList(wrapper);
+        for (Allocation allocation : allocations) {
+            AllocationFindVo allocationFindVo = new AllocationFindVo();
+            BeanUtils.copyProperties(allocation,allocationFindVo);
+            Integer state1 = allocationFindVo.getState();
+            if (integer==0 || integer==1){
+                if (state1==20){
+                    allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
+                }else if (state1==30){
+                    allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
+                }else if (state1==40 ||state1==50){
+                    allocationFindVo.setStateName(AppAllocationStateEnum.COMPLETED.name);
+                }
+            }else {
+                if (state1==20){
+                    allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
+                }else if (state1==30){
+                    allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
+                }else if (state1==40||state1==50){
+                    allocationFindVo.setStateName(AppAllocationStateEnum.COMPLETED.name);
+                }
+            }
+            allocationFindVos.add(allocationFindVo);
+        }
+        return allocationFindVos;
+    }
+
+    /**
+     * ���������������
+     *
+     * @param changeCond
+     */
+    @Override
+    @Transactional
+    public void changeSmallRoutine(AllocationChangeCond changeCond) {
+        Integer integer = unitAreaCode();
+        if (integer==2){
+            throw new BusinessException("���������������������������������������");
+        }
+        AllocationExt allocationExt = oneAllocation(changeCond.getAllocationId());
+        if(!AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(allocationExt.getState())) {
+            throw new BusinessException("������������������������������������");
+        }
+        Allocation allocation = new Allocation();
+        allocation.setAllocationId(changeCond.getAllocationId());
+        allocation.setIsChange(changeCond.getIsChange());
+        allocation.setChangeName(changeCond.getChangeName());
+        allocation.setChangeDescribe(changeCond.getChangeDescribe());
+        allocation.setState(changeCond.getState());
+        allocation.setChangeTime(new Date());
+        this.updateById(allocation);
+        //������������������
+        ApproveTable approveTable = new ApproveTable();
+        approveTable.setRelationId(allocation.getAllocationId());
+        approveTable.setState(AllocationApproveEnum.UNDER_RECTIFICATION.value);
+        approveTable.setStateName(AllocationApproveEnum.UNDER_RECTIFICATION.name);
+        approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
+        approveTableService.saveResult(approveTable);
+        fileTableService.upDateResult(changeCond.getFileChangeList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_RECTIFICATION.value);
+    }
+
+    /**
+     * ���������������
+     *
+     * @param checkCond
+     */
+    @Override
+    @Transactional
+    public void checkSmallRoutine(AllocationCheckCond checkCond) {
+        Integer integer = unitAreaCode();
+        if (integer==0){
+            throw new BusinessException("���������������������������������������");
+        }
+        AllocationExt allocationExt = oneAllocation(checkCond.getAllocationId());
+        if(!AllocationApproveEnum.IN_APPROVAL.value.equals(allocationExt.getState())) {
+            throw new BusinessException("������������������������������������������");
+        }
+        QxUser qxUser = UserHelper.getCurrentUser();
+        Allocation allocation = new Allocation();
+        allocation.setCheckScore(checkCond.getCheckScore());
+        allocation.setAllocationId(checkCond.getAllocationId());
+        allocation.setCheckDescribe(checkCond.getCheckDescribe());
+        allocation.setCheckName(qxUser.getUserName());
+        allocation.setCheckTime(new Date());
+        allocation.setState(checkCond.getState());
+        this.updateById(allocation);
+        //������������������
+        ApproveTable approveTable = new ApproveTable();
+        approveTable.setRelationId(allocation.getAllocationId());
+        if(AllocationApproveEnum.PASS.value.equals(checkCond.getState())){
+            approveTable.setState(AllocationApproveEnum.PASS.value);
+            approveTable.setStateName(AllocationApproveEnum.PASS.name);
+        }else {
+            approveTable.setState(AllocationApproveEnum.REFUSE.value);
+            approveTable.setStateName(AllocationApproveEnum.REFUSE.name);
+        }
+        approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
+        approveTableService.saveResult(approveTable);
+        fileTableService.upDateResult(checkCond.getFileApproveList(),checkCond.getAllocationId(), FileTableEnum.ALLOCATION_APPROVE.value);
+    }
+
+    @Override
     public List<Integer>  unitResult() {
         QxUser user = UserHelper.getCurrentUser();
         Integer unitId = Objects.nonNull(user.getUnitId())?user.getUnitId():0;
-        List<Integer> userList = responsibilityUnitMapper.selectCodeList("JBD",user.getUserId());
+        List<Integer> userList = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_JBD.getValue(),user.getUserId());
         if(CollectionUtils.isNotEmpty(userList)){
             return new ArrayList<>();
         }
@@ -746,4 +790,22 @@
         }
         return Arrays.asList(0);
     }
+
+    @Override
+    public Integer unitAreaCode() {
+        QxUser user = UserHelper.getCurrentUser();
+        List<Integer> userList = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_JBD.getValue(),user.getUserId());
+        if(CollectionUtils.isNotEmpty(userList)){
+            return 1;
+        }
+        if(Objects.nonNull(user.getUnitId())){
+            String code = responsibilityUnitMapper.selectAreaCode(user.getUnitId());
+            if(code.length()>6){
+                return 0;
+            }else {
+                return 2;
+            }
+        }
+        return 1;
+    }
 }

--
Gitblit v1.8.0