From 4686da41b376617f6d447b3546c045ce54f032fa Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Nov 2023 16:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 79 ++++++++++++++++++++++++++++++++-------
1 files changed, 64 insertions(+), 15 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 ff45f61..0b9da91 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
@@ -25,6 +25,7 @@
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.*;
import com.moral.constant.Constants;
@@ -507,6 +508,9 @@
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.setUnitName(getUnitName(allocationExt.getUnitId()).getUnitName());
+ allocationExt.setEscalationUnitName(getUnitName(allocationExt.getEscalationUnitId()).getUnitName());
+ allocationExt.setPolluteTypeName(responsibilityUnitMapper.selectName(Constants.WU_RAN_LEI_XING,allocationExt.getPolluteType()));
return allocationExt;
}
@@ -707,6 +711,8 @@
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);
@@ -845,30 +851,66 @@
}
@Override
- public boolean authority(String allocationNum,Integer userId) {
+ 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)){
- return true;
+ //���������������������
+ 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){
- 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);
- if (allocation.getUnitId().equals(user.getUnitId())){
- return true;
- }
String code = responsibilityUnitMapper.selectAreaCode(user.getUnitId());
- if (code.length() > 6) {
- return false;
- } else {
- return true;
+ 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;
+ }
}
}
- return false;
+ //���������������������
+ appAuthority.setCode(3);
+ appAuthority.setName("������������");
+ return appAuthority;
}
@Override
@@ -911,4 +953,11 @@
}
return f;
}
+
+
+ private ResponsibilityUnit getUnitName(Integer unitId){
+ ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(unitId);
+ return responsibilityUnit;
+ }
+
}
--
Gitblit v1.8.0