From 72a6d5a954312a8a53e5bdd18c5f8f8b57b54dbc Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 08 Nov 2023 14:40:58 +0800
Subject: [PATCH] chore:分享权限修改提交
---
screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java | 3 +
screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAuthority.java | 13 ++++++
screen-api/src/main/java/com/moral/api/service/AllocationService.java | 6 +--
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 42 ++++++++++++++++-----
4 files changed, 49 insertions(+), 15 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java b/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java
index 38c8675..ddec6d4 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java
@@ -6,6 +6,7 @@
import com.moral.api.pojo.query.app.AppAllocationFileCond;
import com.moral.api.pojo.query.app.AppAllocationPageCond;
import com.moral.api.pojo.vo.app.AppAllocationFindVo;
+import com.moral.api.pojo.vo.app.AppAuthority;
import com.moral.constant.PageResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -93,7 +94,7 @@
@ApiOperation(value = "������������")
public ResultMessage authority(@RequestParam @ApiParam(value = "allocationNum",name = "������") String allocationNum,
@RequestParam @ApiParam(value = "userId",name = "������Id") Integer userId){
- Integer authority = allocationService.authority(allocationNum, userId);
+ AppAuthority authority = allocationService.authority(allocationNum, userId);
return ResultMessage.ok(authority);
}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAuthority.java b/screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAuthority.java
new file mode 100644
index 0000000..c7f4b95
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAuthority.java
@@ -0,0 +1,13 @@
+package com.moral.api.pojo.vo.app;
+
+
+import lombok.Data;
+
+@Data
+public class AppAuthority {
+ //������������
+ private Integer code;
+
+ //������������
+ private String name;
+}
diff --git a/screen-api/src/main/java/com/moral/api/service/AllocationService.java b/screen-api/src/main/java/com/moral/api/service/AllocationService.java
index 3bf0d6a..218cbfc 100644
--- a/screen-api/src/main/java/com/moral/api/service/AllocationService.java
+++ b/screen-api/src/main/java/com/moral/api/service/AllocationService.java
@@ -12,13 +12,11 @@
import com.moral.api.pojo.ext.allocation.AllocationListExt;
import com.moral.api.pojo.ext.allocation.AllocationPageExt;
import com.moral.api.pojo.query.allocation.*;
-import com.moral.api.pojo.dto.allocation.AllocationUnitDto;
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.allocation.AllocationPageVo;
-import com.moral.api.pojo.vo.app.AppAllocationFindVo;
+import com.moral.api.pojo.vo.app.AppAuthority;
public interface AllocationService extends IService<Allocation> {
@@ -139,7 +137,7 @@
* @param userId
* @return
*/
- Integer authority(String allocationNum,Integer userId);
+ AppAuthority authority(String allocationNum, Integer userId);
}
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 da34292..2f4eace 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;
@@ -845,7 +846,9 @@
}
@Override
- public Integer authority(String allocationNum,Integer userId) {
+ public AppAuthority authority(String allocationNum,Integer userId) {
+ //������������
+ AppAuthority appAuthority = new AppAuthority();
//������������������
QxUser user = UserHelper.getCurrentUser();
//���������������������
@@ -858,27 +861,46 @@
List<Integer> userList = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_JBD.getValue(),user.getUserId());
if(CollectionUtils.isNotEmpty(userList)){
//���������������������
- return 1;
+ 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)){
- return 1;
- }else{
- return 2;
+ 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(1);
+ appAuthority.setName(AppAllocationStateEnum.COMPLETED.name);
+ return appAuthority;
}
-
} else if (code.length() <= 6){
if (allocation.getState().equals(AllocationApproveEnum.IN_APPROVAL.value)){
- return 1;
- }else{
- return 2;
+ 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(1);
+ appAuthority.setName(AppAllocationStateEnum.COMPLETED.name);
+ return appAuthority;
}
}
}
//���������������������
- return 3;
+ appAuthority.setCode(3);
+ appAuthority.setName("������������");
+ return appAuthority;
}
@Override
--
Gitblit v1.8.0