blame | history | patch | commit | commitdiff | ignore whitespace
cjl
2023-10-20 cbdb9ea8d17e07dda2362d1c61e867afe8395ef2 
 screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java


@@ -1,12 +1,19 @@


package com.moral.api.service.impl;




import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.moral.api.config.Interceptor.UserHelper;


import com.moral.api.entity.*;


import com.moral.api.exception.BusinessException;


import com.moral.api.mapper.AllocationMapper;


import com.moral.api.mapper.ResponsibilityUnitMapper;


import com.moral.api.mapper.SysDictDataMapper;


import com.moral.api.mapper.SysDictTypeMapper;


import com.moral.api.pojo.bean.BaseInvalidEntity;


import com.moral.api.pojo.dto.allocation.AllocationUnitViewDto;


import com.moral.api.pojo.enums.*;


import com.moral.api.pojo.ext.allocation.AllocationExt;


import com.moral.api.pojo.ext.allocation.AllocationListExt;


@@ -15,8 +22,10 @@


import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;


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;


import com.moral.api.service.*;


import com.moral.constant.Constants;


import com.moral.constant.RedisConstants;


import com.moral.util.DateUtils;


import lombok.extern.slf4j.Slf4j;


import org.apache.commons.collections4.CollectionUtils;


import org.springframework.beans.BeanUtils;


@@ -26,43 +35,8 @@


import org.springframework.transaction.annotation.Transactional;


import org.springframework.util.ObjectUtils;




import java.util.ArrayList;


import java.util.Date;


import java.util.HashMap;


import java.util.Iterator;


import java.util.List;


import java.util.Map;


import java.util.Set;


import java.util.stream.Collectors;


import java.util.*;






import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.moral.api.entity.Allocation;


import com.moral.api.entity.ApproveTable;


import com.moral.api.entity.ResponsibilityUnit;


import com.moral.api.entity.SysArea;


import com.moral.api.entity.SysDictData;


import com.moral.api.entity.SysDictType;


import com.moral.api.mapper.AllocationMapper;


import com.moral.api.mapper.ResponsibilityUnitMapper;


import com.moral.api.mapper.SysDictDataMapper;


import com.moral.api.mapper.SysDictTypeMapper;


import com.moral.api.pojo.dto.allocation.AllocationUnitDto;


import com.moral.api.pojo.dto.allocation.AllocationUnitViewDto;


import com.moral.api.pojo.enums.AllocationApproveEnum;


import com.moral.api.pojo.vo.file.FileVo;


import com.moral.api.service.AllocationService;


import com.moral.api.service.FileTableService;


import com.moral.api.service.ResponsibilityUnitService;


import com.moral.api.service.SysAreaService;


import com.moral.api.service.SysDictDataService;


import com.moral.constant.Constants;


import com.moral.constant.RedisConstants;


import com.moral.util.DateUtils;


import com.moral.util.TokenUtils;


import com.sun.javafx.scene.control.skin.VirtualFlow;


import java.util.stream.Collectors;






@Service


@@ -144,7 +118,7 @@


        //单号


        String allocationNum = "JBD-" + dateString + String.format("%04d", i);


        allocation.setAllocationNum(allocationNum);


        if(Objects.nonNull(allocationCond.getEscalationUnitId())&&allocationCond.getEscalationUnitId().toString().length()==6) {


        if(Objects.nonNull(allocationCond.getEscalationUnitId())&& escalationType(allocationCond.getEscalationUnitId())) {


            allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());


        }


        if(NEW_BUILT.equals(allocationCond.getState())) {


@@ -180,7 +154,7 @@


        }


        //获取用户信息


        Allocation allocation = allocationUpdateCond.convert();


        if(Objects.nonNull(allocationUpdateCond.getEscalationUnitId())&&allocationUpdateCond.getEscalationUnitId().toString().length()==6) {


        if(Objects.nonNull(allocationUpdateCond.getEscalationUnitId())&& escalationType(allocationUpdateCond.getEscalationUnitId())) {


            allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());


        }


        if(NEW_BUILT.equals(allocationUpdateCond.getState())) {


@@ -312,7 +286,7 @@


            HashMap<String, Object> typeMap = new HashMap<>();


            List<Allocation> allocations1 = polluteTypeMap.get(polluteType);


            QueryWrapper<SysDictData> sysDictDataQueryWrapper = new QueryWrapper<>();


            sysDictDataQueryWrapper.eq("dict_type_id",31);


            sysDictDataQueryWrapper.eq("dict_type_id",32);


            sysDictDataQueryWrapper.eq("dataKey",polluteType);


            SysDictData sysDictData = sysDictDataMapper.selectOne(sysDictDataQueryWrapper);


            typeMap.put("name",sysDictData.getDataValue());


@@ -808,4 +782,12 @@


        }


        return 1;


    }


    private boolean escalationType(Integer id){


        boolean f = false;


        String code = responsibilityUnitMapper.selectAreaCode(id);


        if(code.length() == 6){


            return true;


        }


        return f;


    }


}