From d8a01a15bf6f310734a18eb7740c7f5ef2d19736 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 27 Oct 2023 10:08:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 140 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 109 insertions(+), 31 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 2c4a3cb..4d0afd5 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
@@ -20,7 +20,10 @@
import com.moral.api.pojo.ext.allocation.AllocationPageExt;
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.user.QxUser;
import com.moral.api.service.*;
import com.moral.constant.Constants;
@@ -64,6 +67,8 @@
private AllocationExtensionService allocationExtensionService;
@Autowired
private ResponsibilityUnitService responsibilityUnitService;
+ @Autowired
+ private SysDictTypeService sysDictTypeService;
/**
* ������������������������������������
@@ -155,9 +160,6 @@
//������������������
Allocation allocation = allocationUpdateCond.convert();
if(Objects.nonNull(allocationUpdateCond.getEscalationUnitId())&& escalationType(allocationUpdateCond.getEscalationUnitId())) {
- allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
- }
- if(Objects.nonNull(allocationUpdateCond.getEscalationUnitId())&&allocationUpdateCond.getEscalationUnitId().toString().length()==6) {
allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
}
if(NEW_BUILT.equals(allocationUpdateCond.getState())) {
@@ -283,13 +285,14 @@
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",32);
+ sysDictDataQueryWrapper.eq("dict_type_id",sysDictType.getId());
sysDictDataQueryWrapper.eq("dataKey",polluteType);
SysDictData sysDictData = sysDictDataMapper.selectOne(sysDictDataQueryWrapper);
typeMap.put("name",sysDictData.getDataValue());
@@ -620,57 +623,65 @@
//������������������
List<Integer> list = unitResult();
if (!ObjectUtils.isEmpty(list)){
- Integer integer = list.get(0);
- if (integer==0){
- return null;
- }else {
- wrapper.in(Allocation::getUnitId,list);
- }
+ wrapper.in(Allocation::getUnitId,list);
}
Integer integer = unitAreaCode();
- //��������������� ���������
- if (integer==0 || integer==1){
+ // ���������
+ if (integer==1){
if (state==3){
- wrapper.in(Allocation::getState,40,50);
- }else if (state==2){
- wrapper.eq(Allocation::getState,30);
+ wrapper.in(Allocation::getState,AllocationApproveEnum.PASS.value,AllocationApproveEnum.REFUSE.value);
}else if (state==1){
- wrapper.eq(Allocation::getState,20);
+ wrapper.in(Allocation::getState,AllocationApproveEnum.UNDER_RECTIFICATION.value,AllocationApproveEnum.DRAFT.value,AllocationApproveEnum.IN_APPROVAL.value);
+ }else {
+ wrapper.eq(Allocation::getState,0);
}
- //������������
- }else if (integer==2){
+ }else if(integer == 0) {
if (state==3){
- wrapper.in(Allocation::getState,40,50);
+ wrapper.in(Allocation::getState,AllocationApproveEnum.PASS.value,AllocationApproveEnum.REFUSE.value);
}else if (state==2){
- wrapper.eq(Allocation::getState,20);
+ wrapper.eq(Allocation::getState,AllocationApproveEnum.IN_APPROVAL.value);
}else if (state==1){
- wrapper.eq(Allocation::getState,30);
+ 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);
+ 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==0 || integer==1){
- if (state1==20){
+ 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==30){
- allocationFindVo.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
- }else if (state1==40 ||state1==50){
+ }else if (state1.equals(AllocationApproveEnum.PASS.value)||state1.equals(AllocationApproveEnum.REFUSE.value)){
allocationFindVo.setStateName(AppAllocationStateEnum.COMPLETED.name);
}
- }else {
- if (state1==20){
+ }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==30){
+ }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==40||state1==50){
+ }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);
}
}
@@ -679,6 +690,73 @@
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();
+ 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);
+ }
+ }
+ if(type.equals(3)){
+ integerList.add(AllocationApproveEnum.PASS.value);
+ integerList.add(AllocationApproveEnum.REFUSE.value);
+ }
+ return integerList;
+ }
+
/**
* ���������������
*
--
Gitblit v1.8.0