From 0972f16bb4354539f782d9f91db83bd9f3b87471 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 28 Sep 2023 10:33:34 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 419 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 311 insertions(+), 108 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..3c0806f 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
@@ -13,10 +13,12 @@
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.user.QxUser;
import com.moral.api.service.AllocationExtensionService;
import com.moral.api.service.ApproveTableService;
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;
@@ -24,18 +26,38 @@
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;
@@ -49,19 +71,23 @@
@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;
/**
* ������������������������������������
@@ -78,27 +104,6 @@
return sysDictDataMapper.selectMaps(dataQueryWrapper);
}
- /**
- * ������������������
- * @return
- */
- @Override
- public List<ResponsibilityUnit> seleteUnit() {
- QueryWrapper<ResponsibilityUnit> wrapper = new QueryWrapper<>();
- wrapper.select("unit_name","unit_id");
- 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<ResponsibilityUnit> responsibilityUnits = responsibilityUnitMapper.selectList(wrapper);
- return responsibilityUnits;
- }
-
/**
* ���������������
@@ -112,12 +117,7 @@
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);
@@ -143,32 +143,6 @@
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;
- }
/**
* ���������������
@@ -195,75 +169,288 @@
approveTable.setStateName(AllocationApproveEnum.NEW_BUILT.name);
approveTableService.saveResult(approveTable);
}
+ if(AllocationApproveEnum.NEW_BUILT.value.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<>();
+ //������������������
+ 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);
+ }
+ }
+ }
- //������������
- 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<>();
+
+ Object number1 = map.get("number");
+ String startTime=null;
+ String endTime=null;
+ if (!ObjectUtils.isEmpty(map.get("startTime")) || !ObjectUtils.isEmpty(map.get("startTime"))){
+ startTime = map.get("startTime").toString();
+ endTime = map.get("endTime").toString();
+
}
- //������������
- if (!ObjectUtils.isEmpty(state)){
- wrapper.eq("state",Integer.parseInt(state.toString()));
+ if (!ObjectUtils.isEmpty(number1)){
+ 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 if(state.equals("10")||state.equals("20") ||state.equals("30")) {
+ 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);
+ }
+ //������������������������
+ 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",31);
+ 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")){
+ //������������
+ 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<>();
+ //������������������
+ 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"))){
+ startTime = map.get("startTime").toString();
+ endTime = map.get("endTime").toString();
+
+ }
+ if (!ObjectUtils.isEmpty(number1)){
+ 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;
+ }
+ //������������������������
+ 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;
+ 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)+"%";
+
+ map1.put("������������",areaByCode.getAreaName());
+ map1.put("���������",total);
+ map1.put("���������",number);
+ map1.put("������������",total-number);
+ map1.put("���������",rate);
+ map1.put("������",deduction);
+ map1.put("������",marks);
+ map1.put("���������",marks+deduction);
+ rsMap.add(map1);
+ }
+ return rsMap;
}
@Override
public Page<AllocationPageExt> extPage(AllocationPageCond allocationPageCond) {
+ List<Integer> unitList = unitResult();
+ allocationPageCond.setUnitList(unitList);
return this.baseMapper.extPage(allocationPageCond.getPage().convertPage(), allocationPageCond);
}
@@ -273,7 +460,7 @@
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));
return allocationExt;
}
@@ -304,7 +491,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 +504,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 +522,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 +561,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){
@@ -385,4 +573,19 @@
fileTableService.upDateResult(allocationExtensionAddCond.getFileList(),allocationExtension.getId(), FileTableEnum.ALLOCATION_EXTENSION.value);
return true;
}
+
+ @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());
+ if(CollectionUtils.isNotEmpty(userList)){
+ return new ArrayList<>();
+ }
+ userList = responsibilityUnitMapper.selectResultList(unitId);
+ if(CollectionUtils.isNotEmpty(userList)){
+ return userList;
+ }
+ return Arrays.asList(0);
+ }
}
--
Gitblit v1.8.0