From ee8bb47024e9ef5a585a5f4d61d1ab236c9d4341 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Tue, 23 Apr 2024 15:05:33 +0800
Subject: [PATCH] fix：因子相关性比较均值
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 906 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 788 insertions(+), 118 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 de6bc3f..6dd4799 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,67 +1,91 @@
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.controller.LogController;
import com.moral.api.entity.*;
import com.moral.api.exception.BusinessException;
+import com.moral.api.mapper.AllocationLogMapper;
+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.mapper.UserLogMapper;
+import com.moral.api.mapper.UserMapper;
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.AllocationExcelExt;
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.query.app.AppAllocationFileCond;
+import com.moral.api.pojo.query.app.AppAllocationPageCond;
+import com.moral.api.pojo.vo.allocation.AllocationFindVo;
+import com.moral.api.pojo.vo.app.AppAllocationFindVo;
+import com.moral.api.pojo.vo.app.AppAuthority;
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.api.utils.BeanConverts;
+import com.moral.constant.Constants;
+import com.moral.constant.RedisConstants;
+import com.moral.util.DateUtils;
+import com.moral.util.WebUtils;
+
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
import java.util.*;
+import java.util.stream.Collectors;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-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.service.AllocationService;
-import com.moral.api.service.FileTableService;
-import com.moral.constant.Constants;
-import com.moral.constant.RedisConstants;
-import com.moral.util.DateUtils;
-import com.moral.util.TokenUtils;
+import javax.servlet.http.HttpServletRequest;
@Service
@Slf4j
public class AllocationServiceImpl extends ServiceImpl<AllocationMapper, Allocation> implements AllocationService {
+ private final Integer NEW_BUILT = 10;
@Autowired
private SysDictTypeMapper sysDictTypeMapper;
@Autowired
- private SysDictDataMapper sysDictDataMapper;
- @Autowired
private ResponsibilityUnitMapper responsibilityUnitMapper;
+ @Autowired
+ private SysDictDataMapper sysDictDataMapper;
@Autowired
private RedisTemplate redisTemplate;
@Autowired
private AllocationMapper allocationMapper;
+ @Autowired
+ private SysAreaService sysAreaService;
@Autowired
private ApproveTableService approveTableService;
@Autowired
private FileTableService fileTableService;
@Autowired
private AllocationExtensionService allocationExtensionService;
+ @Autowired
+ private ResponsibilityUnitService responsibilityUnitService;
+ @Autowired
+ private SysDictTypeService sysDictTypeService;
+ @Autowired
+ private UserService userService;
+ @Autowired
+ private AllocationLogMapper allocationLogMapper;
/**
* ������������������������������������
@@ -89,11 +113,11 @@
wrapper.eq("is_del",Constants.NOT_DELETE);
wrapper.eq("state",0);
wrapper.eq("is_invalid",0);
+
//������������������
- Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
- Object code = userInfo.get("code");
- if (!ObjectUtils.isEmpty(code)){
- wrapper.eq("area_code",code);
+ List<Integer> unitList = unitResult();
+ if (CollectionUtils.isNotEmpty(unitList)){
+ wrapper.in("unit_id",unitList);
}
List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitMapper.selectList(wrapper);
return responsibilityUnits;
@@ -112,63 +136,34 @@
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) {
+ if(Objects.nonNull(allocationCond.getEscalationUnitId())&& !allocationCond.getEscalationUnitId().equals(allocationCond.getUnitId()) && escalationType(allocationCond.getEscalationUnitId())) {
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);
+ //������������
+ userService.pushOneUser(allocation);
redisTemplate.opsForValue().set(RedisConstants.JBD_DATA,i);
- if(AllocationApproveEnum.NEW_BUILT.value.equals(allocationCond.getState())) {
+ if(NEW_BUILT.equals(allocationCond.getState())||AllocationApproveEnum.UNDER_RECTIFICATION.value.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;
- }
/**
* ���������������
@@ -183,88 +178,342 @@
}
//������������������
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(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(NEW_BUILT.equals(allocationUpdateCond.getState())) {
+ allocation.setState(AllocationApproveEnum.UNDER_RECTIFICATION.value);
}
fileTableService.upDateResult(allocationUpdateCond.getFileBaseList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_FOUNDATION.value);
allocationMapper.updateById(allocation);
}
+
+
+
/**
- * ������������������
+ * ������������
* @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());
+ public Map<String, Object> selectUnitView(Map<String, Object> map) {
QueryWrapper<Allocation> wrapper = new QueryWrapper<>();
+ //������������������
+ 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);
+ }
+ }
+ }
- //������������
- if (!ObjectUtils.isEmpty(unitId)){
- wrapper.eq("unit_id",Integer.parseInt(unitId.toString()));
+
+
+ HashMap<String, Object> rsMap = new HashMap<>();
+ ArrayList<Map<String, Object>> polluteArrayList = new ArrayList<>();
+ ArrayList<Map<String, Object>> escalationTypeList = new ArrayList<>();
+ ArrayList<AllocationUnitViewDto> allocationUnitViewDtos = new ArrayList<>();
+
+ String number1 = map.get("number").toString();
+ String startTime=null;
+ String endTime=null;
+ if (!ObjectUtils.isEmpty(map.get("startTime")) || !ObjectUtils.isEmpty(map.get("endTime"))){
+ startTime = map.get("startTime").toString();
+// endTime = map.get("endTime").toString();
+ endTime = DateUtils.getDateOfDay(map.get("endTime").toString(), 1, DateUtils.yyyy_MM_dd_EN);
+
}
- //������������
- if (!ObjectUtils.isEmpty(state)){
- wrapper.eq("state",Integer.parseInt(state.toString()));
+ if (!number1.equals("0")){
+ String s = "-"+number1;
+ //������������������
+ endTime = DateUtils.getCurDateTime();
+ startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
}
- //������������
- 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()));
- }
+
+ wrapper.between("escalation_time",startTime,endTime);
+ wrapper.eq("is_del",0);
+ wrapper.eq("is_invalid",0);
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);
+ if (ObjectUtils.isEmpty(allocations)){
+ return null;
}
- return null;
+ int complete=0;
+ int unComplete=0;
+ for (Allocation allocation : allocations) {
+ String state = allocation.getState()+"";
+ if (state.equals("40")||state.equals("50")){
+ complete++;
+ }else {
+ unComplete++;
+ }
+ }
+ //������������������������
+ Map<Integer, List<Allocation>> escalationTypeMap = allocations.stream().collect(Collectors.groupingBy(o -> o.getEscalationType()));
+ Set<Integer> escalationTypes = escalationTypeMap.keySet();
+ for (Integer escalationType : escalationTypes) {
+ List<Allocation> allocations1 = escalationTypeMap.get(escalationType);
+ String value = AllocationEscalationTypeEnum.SELF.value.toString();
+ HashMap<String, Object> typeMap = new HashMap<>();
+ if (value.equals(escalationType+"")){
+ typeMap.put("name",AllocationEscalationTypeEnum.SELF.name);
+ }else {
+ typeMap.put("name",AllocationEscalationTypeEnum.CHECK.name);
+ }
+ typeMap.put("value",allocations1.size());
+ escalationTypeList.add(typeMap);
+ }
+ //������������������������
+ SysDictType sysDictType = sysDictTypeService.slectFind(Constants.WU_RAN_LEI_XING);
+ 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<>();
+ sysDictDataQueryWrapper.eq("dict_type_id",sysDictType.getId());
+ sysDictDataQueryWrapper.eq("dataKey",polluteType);
+ SysDictData sysDictData = sysDictDataMapper.selectOne(sysDictDataQueryWrapper);
+ typeMap.put("name",sysDictData.getDataValue());
+ typeMap.put("value",allocations1.size());
+ polluteArrayList.add(typeMap);
+ }
+ //������������������������
+ Map<Integer, List<Allocation>> unitMap = allocations.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
+ Set<Integer> unitList = unitMap.keySet();
+ //������������
+ int overdue=0;
+ 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);
+ //������
+ int marks=0;
+ //������
+ int deduction=0;
+ int number=0;
+ for (Allocation allocation : allocations1) {
+ String state = allocation.getState()+"";
+ Integer changeType = allocation.getChangeType();
+ String value = ChangeEnum.DEADLINE.value.toString();
+ if (value.equals(changeType+"")){
+ 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") && !state.equals("9")){
+ //������������
+ overdue++;
+ }
+ }
+ if (state.equals("40")||state.equals("50")){
+ if (allocation.getCheckScore()>0){
+ marks = marks + allocation.getCheckScore();
+ }else {
+ deduction = deduction + allocation.getCheckScore();
+ }
+ number++;
+ }
+ }
+ int total = allocations1.size();
+ allocationUnitViewDto.setDeduction(deduction);
+ allocationUnitViewDto.setMarks(marks);
+ allocationUnitViewDto.setTotal(total);
+ allocationUnitViewDto.setTotalPoints(marks+deduction);
+ allocationUnitViewDto.setNumber(number);
+ String rate = (number * 100 /total)+"%";
+ allocationUnitViewDto.setRate(rate);
+ allocationUnitViewDto.setUnNumber(total-number);
+ allocationUnitViewDto.setUnitName(areaByCode.getAreaName());
+ allocationUnitViewDtos.add(allocationUnitViewDto);
+ }
+ rsMap.put("unitView",allocationUnitViewDtos);
+ //������
+ rsMap.put("total",allocations.size());
+ //���������
+ rsMap.put("complete",complete);
+ //���������
+ rsMap.put("unComplete",unComplete);
+ //������
+ rsMap.put("overdue",overdue);
+ //������������
+ rsMap.put("polluteType",polluteArrayList);
+ //������������
+ rsMap.put("escalationType",escalationTypeList);
+ return rsMap;
+ }
+
+
+ /**
+ * ������
+ * @param map
+ * @return
+ */
+ @Override
+ public List<Map<String, Object>> unitExel(Map<String, Object> map) {
+ QueryWrapper<Allocation> wrapper = new QueryWrapper<>();
+ //������������������
+ 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);
+ }
+ }
+ }
+
+
+ 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("endTime"))){
+ startTime = map.get("startTime").toString();
+ endTime = map.get("endTime").toString();
+
+ }
+ if (Integer.parseInt(number1.toString())>0){
+ String s = "-"+number1;
+ //������������������
+ endTime = DateUtils.getCurDateTime();
+ startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ }
+
+ wrapper.between("escalation_time",startTime,endTime);
+ wrapper.eq("is_del",0);
+ wrapper.eq("is_invalid",0);
+ List<Allocation> allocations = allocationMapper.selectList(wrapper);
+ if (ObjectUtils.isEmpty(allocations)){
+ return null;
+ }
+ int totals=0;
+ int sum1=0;
+ int sum2=0;
+ int sum3=0;
+ int sum4=0;
+ int deductions=0;
+ int score=0;
+ int sum5=0;
+
+ //������������������������
+ Map<Integer, List<Allocation>> unitMap = allocations.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
+ Set<Integer> unitList = unitMap.keySet();
+ for (Integer integer : unitList) {
+// HashMap<String, Object> map1 = new HashMap<>();
+ 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;
+ //������
+ int deduction=0;
+ int number=0;
+ Map<Integer, List<Allocation>> collect = allocations1.stream().collect(Collectors.groupingBy(o -> o.getState()));
+ //������
+ List<Allocation> allocations2 = collect.get(20);
+ //������
+ List<Allocation> allocations3 = collect.get(30);
+ //������
+ List<Allocation> allocations4 = collect.get(40);
+ //������
+ List<Allocation> allocations5 = collect.get(50);
+ for (Allocation allocation : allocations1) {
+ String state = allocation.getState()+"";
+ if (state.equals("40")||state.equals("50")){
+ if (allocation.getCheckScore()>0){
+ marks = marks + allocation.getCheckScore();
+ }else {
+ deduction = deduction + allocation.getCheckScore();
+ }
+ number++;
+ }
+ }
+ int total = allocations1.size();
+ String rate = (number * 100 /total)+"%";
+
+ int i1 = ObjectUtils.isEmpty(allocations2) ? 0 : allocations2.size();
+ int i2 = ObjectUtils.isEmpty(allocations3) ? 0 : allocations3.size();
+ int i3 = ObjectUtils.isEmpty(allocations4) ? 0 : allocations4.size();
+ int i4 = ObjectUtils.isEmpty(allocations5) ? 0 : allocations5.size();
+ map1.put("������������",areaByCode.getAreaName());
+ map1.put("���������",total);
+ map1.put("������",i1);
+ map1.put("������",i2);
+ map1.put("������",i3);
+ map1.put("������",i4);
+// map1.put("���������",number);
+// map1.put("������������",total-number);
+ map1.put("���������",rate);
+ map1.put("������",deduction);
+ map1.put("������",marks);
+ map1.put("���������",marks+deduction);
+ rsMap.add(map1);
+ //������
+ totals = totals + total;
+ sum1 = sum1 + i1;
+ sum2 = sum2 + i2;
+ sum3 = sum3 + i3;
+ sum4 = sum4 + i4;
+ deductions = deductions + deduction;
+ score = score + marks;
+ sum5 = sum5 + marks+deduction;
+ }
+ HashMap<String, Object> map1 = new HashMap<>();
+ map1.put("������������","������");
+ map1.put("���������",totals);
+ map1.put("������",sum1);
+ map1.put("������",sum2);
+ map1.put("������",sum3);
+ map1.put("������",sum4);
+ map1.put("������",deductions);
+ map1.put("������",score);
+ map1.put("���������",sum5);
+ rsMap.add(map1);
+ return rsMap;
}
@Override
public Page<AllocationPageExt> extPage(AllocationPageCond allocationPageCond) {
- return this.baseMapper.extPage(allocationPageCond.getPage().convertPage(), allocationPageCond);
+ List<Integer> unitAuthority = this.getUnitAuthority(SysDictTypeEnum.SYS_AMEND.value);
+ List<Integer> unitList = unitResult();
+ Integer codeId = unitAreaCode();
+ allocationPageCond.setUnitList(unitList);
+ 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);
+ }
+ it.setIsCode(ObjectUtils.isEmpty(unitAuthority)?"2":"1");
+ });
+ }
+ return page;
}
@Override
@@ -273,7 +522,10 @@
allocationExt.setFileBaseList(fileTableService.list(id,FileTableEnum.ALLOCATION_FOUNDATION.value));
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.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;
}
@@ -297,6 +549,9 @@
allocation.setState(changeCond.getState());
allocation.setChangeTime(new Date());
this.updateById(allocation);
+ //������������
+ Allocation allocation1 = this.getById(changeCond.getAllocationId());
+ userService.pushOneUser(allocation1);
//������������������
ApproveTable approveTable = new ApproveTable();
approveTable.setRelationId(allocation.getAllocationId());
@@ -304,7 +559,7 @@
approveTable.setStateName(AllocationApproveEnum.UNDER_RECTIFICATION.name);
approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
approveTableService.saveResult(approveTable);
- fileTableService.upDateResult(changeCond.getFileChangeList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_FOUNDATION.value);
+ fileTableService.upDateResult(changeCond.getFileChangeList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_RECTIFICATION.value);
}
@Override
@@ -317,6 +572,7 @@
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());
@@ -334,7 +590,7 @@
}
approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
approveTableService.saveResult(approveTable);
- fileTableService.upDateResult(checkCond.getFileApproveList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_FOUNDATION.value);
+ fileTableService.upDateResult(checkCond.getFileApproveList(),checkCond.getAllocationId(), FileTableEnum.ALLOCATION_APPROVE.value);
}
@Override
@@ -373,7 +629,7 @@
if( !AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(allocationExt.getState())) {
type = true;
}
- if(!ChangeEnum.DEADLINE.value.equals(allocationExt.getState())){
+ if(!ChangeEnum.DEADLINE.value.equals(allocationExt.getChangeType())){
type = true;
}
if(type){
@@ -381,8 +637,422 @@
}
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)){
+ wrapper.in(Allocation::getUnitId,list);
+ }
+ Integer integer = unitAreaCode();
+ // ���������
+ if (integer==1){
+ if (state==3){
+ wrapper.in(Allocation::getState,AllocationApproveEnum.PASS.value,AllocationApproveEnum.REFUSE.value);
+ }else if (state==1){
+ wrapper.in(Allocation::getState,AllocationApproveEnum.UNDER_RECTIFICATION.value,AllocationApproveEnum.DRAFT.value,AllocationApproveEnum.IN_APPROVAL.value);
+ }else {
+ wrapper.eq(Allocation::getState,0);
+ }
+ }else if(integer == 0) {
+ if (state==3){
+ wrapper.in(Allocation::getState,AllocationApproveEnum.PASS.value,AllocationApproveEnum.REFUSE.value);
+ }else if (state==2){
+ wrapper.eq(Allocation::getState,AllocationApproveEnum.IN_APPROVAL.value);
+ }else if (state==1){
+ wrapper.in(Allocation::getState,AllocationApproveEnum.UNDER_RECTIFICATION.value,AllocationApproveEnum.DRAFT.value);
+ }
+ }else if(integer == 2){
+ if (state==3){
+ wrapper.in(Allocation::getState,AllocationApproveEnum.PASS.value,AllocationApproveEnum.REFUSE.value);
+ }else if (state==2){
+ wrapper.in(Allocation::getState,AllocationApproveEnum.UNDER_RECTIFICATION.value,AllocationApproveEnum.DRAFT.value);
+ }else if (state==1){
+ wrapper.eq(Allocation::getState,AllocationApproveEnum.IN_APPROVAL.value);
+ }
+ }
+ 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,Allocation::getAllocationId);
+ List<Allocation> allocations = allocationMapper.selectList(wrapper);
+ for (Allocation allocation : allocations) {
+ AllocationFindVo allocationFindVo = new AllocationFindVo();
+ BeanUtils.copyProperties(allocation,allocationFindVo);
+ Integer state1 = allocationFindVo.getState();
+ if ( integer==2){
+ if (state1.equals(AllocationApproveEnum.DRAFT.value)||state1.equals(AllocationApproveEnum.UNDER_RECTIFICATION.value)){
+ allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
+ }else if (state1.equals(AllocationApproveEnum.IN_APPROVAL.value)){
+ allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
+ }else if (state1.equals(AllocationApproveEnum.PASS.value)||state1.equals(AllocationApproveEnum.REFUSE.value)){
+ allocationFindVo.setStateName(AppAllocationStateEnum.COMPLETED.name);
+ }
+ }else if(integer==1){
+ if (state1.equals(AllocationApproveEnum.DRAFT.value)||state1.equals(AllocationApproveEnum.UNDER_RECTIFICATION.value)||state1.equals(AllocationApproveEnum.IN_APPROVAL.value)){
+ allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
+ }else if (state1.equals(AllocationApproveEnum.PASS.value)||state1.equals(AllocationApproveEnum.REFUSE.value)){
+ allocationFindVo.setStateName(AppAllocationStateEnum.COMPLETED.name);
+ }
+ }else if(integer==0) {
+ if (state1.equals(AllocationApproveEnum.DRAFT.value)||state1.equals(AllocationApproveEnum.UNDER_RECTIFICATION.value)){
+ allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
+ }else if (state1.equals(AllocationApproveEnum.IN_APPROVAL.value)){
+ allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
+ }else if (state1.equals(AllocationApproveEnum.PASS.value)||state1.equals(AllocationApproveEnum.REFUSE.value)){
+ allocationFindVo.setStateName(AppAllocationStateEnum.COMPLETED.name);
+ }
+ }
+ allocationFindVos.add(allocationFindVo);
+ }
+ return allocationFindVos;
+ }
+
+ @Override
+ public Page<AllocationPageExt> pageApp(AppAllocationPageCond allocationPageCond) {
+ List<Integer> listUnit = unitResult();
+ Integer integer = unitAreaCode();
+ allocationPageCond.setUnitList(listUnit);
+ allocationPageCond.setStateList(stateAllocationList(allocationPageCond.getState(),integer));
+ 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);
+ }else if(integer==2){
+ it.setStateName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
+ }
+ }else if(state.equals(AllocationApproveEnum.IN_APPROVAL.value)){
+ if(integer==2||integer==1){
+ it.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
+ }else if(integer==0){
+ it.setStateName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
+ }
+ }else{
+ it.setStateName(AppAllocationStateEnum.COMPLETED.name);
+ }
+ });
+
+ return extAppPage;
+ }
+
+ @Override
+ @Transactional
+ public boolean saveFile(AppAllocationFileCond appAllocationFileCond) {
+ fileTableService.upDateResult(Arrays.asList(appAllocationFileCond.getFile()),appAllocationFileCond.getUserId(), FileTableEnum.APP_ALLOCATION.value);
+ return true;
+ }
+
+ private List<Integer> stateAllocationList(Integer type, Integer integer){
+ List<Integer> integerList = new ArrayList<>();
+ // type 0 ������ 1������ 2��������� 3 ���������
+ if(integer.equals(0)){
+ if(type.equals(1)){
+ integerList.add(AllocationApproveEnum.UNDER_RECTIFICATION.value);
+ integerList.add(AllocationApproveEnum.DRAFT.value);
+ }else if(type.equals(2)){
+ integerList.add(AllocationApproveEnum.IN_APPROVAL.value);
+ }
+ }else if(integer.equals(2)){
+ if(type.equals(1)){
+ integerList.add(AllocationApproveEnum.IN_APPROVAL.value);
+ }else if(type.equals(2)){
+ integerList.add(AllocationApproveEnum.UNDER_RECTIFICATION.value);
+ integerList.add(AllocationApproveEnum.DRAFT.value);
+ }
+ }else if(integer.equals(1)){
+ if(type.equals(1)){
+ integerList.add(AllocationApproveEnum.IN_APPROVAL.value);
+ integerList.add(AllocationApproveEnum.UNDER_RECTIFICATION.value);
+ integerList.add(AllocationApproveEnum.DRAFT.value);
+ }else if(type.equals(2)){
+ integerList.add(0);
+ }
+ }
+ if(type.equals(3)){
+ integerList.add(AllocationApproveEnum.PASS.value);
+ integerList.add(AllocationApproveEnum.REFUSE.value);
+ }
+ return integerList;
+ }
+
+ /**
+ * ���������������
+ *
+ * @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.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
+ /* approveTable.setState(NEW_BUILT);
+ approveTable.setStateName("������");
+ approveTableService.saveResult(approveTable);*/
+ approveTable.setState(AllocationApproveEnum.UNDER_RECTIFICATION.value);
+ approveTable.setStateName(AllocationApproveEnum.UNDER_RECTIFICATION.name);
+ 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 AppAuthority authority(String allocationNum,Integer userId) {
+ //������������
+ AppAuthority appAuthority = new AppAuthority();
+ //������������������
+ QxUser user = UserHelper.getCurrentUser();
+ //���������������������
+ LambdaQueryWrapper<Allocation> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(Allocation::getAllocationNum,allocationNum);
+ wrapper.eq(Allocation::getIsDel,0);
+ wrapper.eq(Allocation::getIsInvalid,0);
+ Allocation allocation = allocationMapper.selectOne(wrapper);
+
+ List<Integer> userList = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_JBD.getValue(),user.getUserId());
+ if(CollectionUtils.isNotEmpty(userList)){
+ //���������������������
+ 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){
+ String code = responsibilityUnitMapper.selectAreaCode(user.getUnitId());
+ if (code.length() > 6 && allocation.getUnitId().equals(user.getUnitId())) {
+ if (allocation.getState().equals(AllocationApproveEnum.UNDER_RECTIFICATION.value)){
+ appAuthority.setCode(1);
+ appAuthority.setName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
+ return appAuthority;
+ }else if (allocation.getState().equals(AllocationApproveEnum.IN_APPROVAL.value)){
+ appAuthority.setCode(2);
+ appAuthority.setName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
+ return appAuthority;
+ }else {
+ appAuthority.setCode(2);
+ appAuthority.setName(AppAllocationStateEnum.COMPLETED.name);
+ return appAuthority;
+ }
+ } else if (code.length() <= 6){
+ if (allocation.getState().equals(AllocationApproveEnum.IN_APPROVAL.value)){
+ appAuthority.setCode(1);
+ appAuthority.setName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
+ return appAuthority;
+ }else if (allocation.getState().equals(AllocationApproveEnum.UNDER_RECTIFICATION.value)){
+ appAuthority.setCode(2);
+ appAuthority.setName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
+ return appAuthority;
+ }else {
+ appAuthority.setCode(2);
+ appAuthority.setName(AppAllocationStateEnum.COMPLETED.name);
+ return appAuthority;
+ }
+ }
+ }
+ //���������������������
+ appAuthority.setCode(3);
+ appAuthority.setName("������������");
+ return appAuthority;
+ }
+
+ /**
+ * ������������������
+ *
+ * @param id
+ * @param unitId
+ */
+ @Override
+ @Transactional
+ public void updataUnit(Integer id, Integer unitId,Integer polluteType) {
+ AllocationLog allocationLog = new AllocationLog();
+ //������������������
+ QxUser user = UserHelper.getCurrentUser();
+ Allocation allocation = allocationMapper.selectById(id);
+ if (!ObjectUtils.isEmpty(unitId)){
+ ResponsibilityUnit unitName1 = getUnitName(allocation.getUnitId());
+ ResponsibilityUnit unitName2 = getUnitName(unitId);
+ allocation.setUnitId(unitId);
+ allocationLog.setContent(unitName1.getUnitName()+"----���������----"+unitName2.getUnitName());
+
+ }
+ if (!ObjectUtils.isEmpty(polluteType)){
+ SysDictData sysDictData1 = sysDictTypeService.listOne(Constants.WU_RAN_LEI_XING,allocation.getPolluteType().toString());
+ SysDictData sysDictData2 = sysDictTypeService.listOne(Constants.WU_RAN_LEI_XING, polluteType.toString());
+ allocation.setPolluteType(polluteType);
+ allocationLog.setPolluteType(sysDictData1.getDataValue()+"----���������----"+sysDictData2.getDataValue());
+ }
+
+ allocationMapper.updateById(allocation);
+ //������
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ allocationLog.setAllocationNum(allocation.getAllocationNum());
+ allocationLog.setIp(WebUtils.getIpAddr(request));
+ allocationLog.setAccountId(user.getUserId());
+ allocationLog.setAccount(user.getAccount());
+ allocationLog.setUserName(user.getUserName());
+ allocationLog.setCreateTime(new Date());
+ allocationLogMapper.insert(allocationLog);
+
+ }
+
+ /**
+ * ������������������
+ *
+ * @param allocationNum
+ * @return
+ */
+ @Override
+ public List<AllocationLog> getLog(String allocationNum) {
+ LambdaQueryWrapper<AllocationLog> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(AllocationLog::getAllocationNum,allocationNum);
+ wrapper.orderByAsc(AllocationLog::getCreateTime);
+ List<AllocationLog> allocationLogs = allocationLogMapper.selectList(wrapper);
+ return allocationLogs;
+ }
+
+ /**
+ * ������������������������������
+ *
+ * @param code
+ * @return
+ */
+ @Override
+ public List<Integer> getUnitAuthority(String code) {
+ QxUser user = UserHelper.getCurrentUser();
+ List<Integer> userList = responsibilityUnitMapper.selectCodeList(code,user.getUserId());
+ return userList;
+ }
+
+ @Override
+ public List<Integer> unitResult() {
+ QxUser user = UserHelper.getCurrentUser();
+ Integer unitId = Objects.nonNull(user.getUnitId())?user.getUnitId():0;
+ List<Integer> userList = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_JBD.getValue(),user.getUserId());
+ if(CollectionUtils.isNotEmpty(userList)){
+ return new ArrayList<>();
+ }
+ userList = responsibilityUnitMapper.selectResultList(unitId);
+ if(CollectionUtils.isNotEmpty(userList)){
+ return userList;
+ }
+ 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())&&user.getUnitId()!=0) {
+ String code = responsibilityUnitMapper.selectAreaCode(user.getUnitId());
+ if (code.length() > 6) {
+ return 0;
+ } else {
+ return 2;
+ }
+ }
+ return 0;
+ }
+ private boolean escalationType(Integer id){
+ boolean f = false;
+ String code = responsibilityUnitMapper.selectAreaCode(id);
+ if(code.length() == 6){
+ return true;
+ }
+ return f;
+ }
+
+
+ private ResponsibilityUnit getUnitName(Integer unitId){
+ ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(unitId);
+ return responsibilityUnit;
+ }
+
+ @Override
+ public List<AllocationExcelExt> listExcel(List<Integer> id) {
+ List<AllocationExcelExt> list = new ArrayList<>();
+ for(Integer i : id){
+ AllocationExt allocationExt = oneAllocation(i);
+ AllocationExcelExt allocationExcelExt = BeanConverts.convert(allocationExt,AllocationExcelExt.class);
+ allocationExcelExt.setFileBaseList(fileTableService.list(i,FileTableEnum.ALLOCATION_FOUNDATION.value,FileType.PICTURE.getValue()));
+ allocationExcelExt.setFileChangeList(fileTableService.list(i,FileTableEnum.ALLOCATION_RECTIFICATION.value,FileType.PICTURE.getValue()));
+ list.add(allocationExcelExt);
+ }
+ return list;
+ }
}
--
Gitblit v1.8.0