From e94e5dbbfc544c558a09fb388e7f4d4341fe8ec4 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 28 Sep 2023 16:59:01 +0800
Subject: [PATCH] ci:添加自有权限
---
screen-api/src/main/java/com/moral/api/pojo/vo/allocationextension/AllocationExtensionPageVo.java | 3 +
screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java | 2
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java | 2 +
screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java | 14 ++++++
screen-api/src/main/java/com/moral/api/service/AllocationService.java | 2 +
screen-api/src/main/java/com/moral/api/mapper/ResponsibilityUnitMapper.java | 2 +
screen-api/src/main/java/com/moral/api/pojo/ext/allocationextension/AllocationExtensionPageExt.java | 2 +
screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java | 2 +
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 31 +++++++++++++++
screen-api/src/main/resources/mapper/ResponsibilityUnitMapper.xml | 3 +
screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java | 2
11 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java b/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
index 8ebcc3d..f94d330 100644
--- a/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
+++ b/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
@@ -34,7 +34,7 @@
-@Component
+//@Component
@Slf4j
public class CruiserDataConsumer implements ConsumerSeekAware {
diff --git a/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java b/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java
index 4882e3d..b44ffd4 100644
--- a/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java
+++ b/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java
@@ -35,7 +35,7 @@
-@Component
+//@Component
@Slf4j
public class SecondDataConsumer implements ConsumerSeekAware {
diff --git a/screen-api/src/main/java/com/moral/api/mapper/ResponsibilityUnitMapper.java b/screen-api/src/main/java/com/moral/api/mapper/ResponsibilityUnitMapper.java
index f7c0a00..6dec41c 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/ResponsibilityUnitMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/ResponsibilityUnitMapper.java
@@ -16,6 +16,8 @@
*/
List<Integer> selectResultList(@Param("id") Integer id);
+ String selectAreaCode(@Param("id") Integer id);
+
/**
* ������������id
*/
diff --git a/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java b/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java
index 4608560..ec7aec1 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java
@@ -21,4 +21,6 @@
private Integer applyState;
+
+ private Integer isApprove;
}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/ext/allocationextension/AllocationExtensionPageExt.java b/screen-api/src/main/java/com/moral/api/pojo/ext/allocationextension/AllocationExtensionPageExt.java
index e28afd4..d3c755d 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/ext/allocationextension/AllocationExtensionPageExt.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/ext/allocationextension/AllocationExtensionPageExt.java
@@ -43,4 +43,6 @@
@ApiModelProperty(value = "���������")
private String escalationName;
+
+ private Integer isApprove;
}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java
index 3264fd6..7aede07 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationPageVo.java
@@ -96,6 +96,8 @@
@ApiModelProperty(value = "������������������")
private Integer applyState;
+ @ApiModelProperty(value = "������������")
+ private Integer isApprove;
public static AllocationPageVo convert(AllocationPageExt allocationPageExt) {
AllocationPageVo allocationPageVo = BeanConverts.convert(allocationPageExt, AllocationPageVo.class);
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/allocationextension/AllocationExtensionPageVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/allocationextension/AllocationExtensionPageVo.java
index f9915bc..2eab93f 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/allocationextension/AllocationExtensionPageVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/allocationextension/AllocationExtensionPageVo.java
@@ -83,7 +83,8 @@
@JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date updateTime;
-
+ @ApiModelProperty(value = "������������")
+ private Integer isApprove;
public static AllocationExtensionPageVo convert(AllocationExtensionPageExt allocationExtensionPageExt) {
AllocationExtensionPageVo allocationExtensionPageVo = BeanConverts.convert(allocationExtensionPageExt, AllocationExtensionPageVo.class);
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 16f4f0f..51278e3 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
@@ -27,6 +27,8 @@
List<Integer> unitResult();
+ Integer unitAreaCode();
+
Map<String, Object> selectUnitView(Map<String,Object> map);
List<Map<String,Object>> unitExel(Map<String,Object> map);
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java
index 86b05aa..61cb019 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java
@@ -16,6 +16,7 @@
import com.moral.api.service.AllocationExtensionService;
import com.moral.api.service.AllocationService;
import com.moral.api.service.FileTableService;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -68,7 +69,18 @@
public Page<AllocationExtensionPageExt> extPage(AllocationExtensionPageCond allocationExtensionPageCond) {
List<Integer> unitList = allocationService.unitResult();
allocationExtensionPageCond.setUnitList(unitList);
- return this.baseMapper.extPage(allocationExtensionPageCond.getPage().convertPage(), allocationExtensionPageCond);
+ Integer codeId = allocationService.unitAreaCode();
+ Page<AllocationExtensionPageExt> page = this.baseMapper.extPage(allocationExtensionPageCond.getPage().convertPage(), allocationExtensionPageCond);
+ 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);
+ }
+ });
+ }
+ return page;
}
@Override
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 b363f05..d58c404 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
@@ -472,8 +472,19 @@
@Override
public Page<AllocationPageExt> extPage(AllocationPageCond allocationPageCond) {
List<Integer> unitList = unitResult();
+ Integer codeId = unitAreaCode();
allocationPageCond.setUnitList(unitList);
- return this.baseMapper.extPage(allocationPageCond.getPage().convertPage(), allocationPageCond);
+ 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);
+ }
+ });
+ }
+ return page;
}
@Override
@@ -610,4 +621,22 @@
}
return Arrays.asList(0);
}
+
+ @Override
+ public Integer unitAreaCode() {
+ QxUser user = UserHelper.getCurrentUser();
+ List<Integer> userList = responsibilityUnitMapper.selectCodeList("JBD",user.getUserId());
+ if(CollectionUtils.isNotEmpty(userList)){
+ return 1;
+ }
+ if(Objects.nonNull(user.getUnitId())){
+ String code = responsibilityUnitMapper.selectAreaCode(user.getUnitId());
+ if(code.length()>6){
+ return 0;
+ }else {
+ return 2;
+ }
+ }
+ return 1;
+ }
}
diff --git a/screen-api/src/main/resources/mapper/ResponsibilityUnitMapper.xml b/screen-api/src/main/resources/mapper/ResponsibilityUnitMapper.xml
index 5433c08..522b283 100644
--- a/screen-api/src/main/resources/mapper/ResponsibilityUnitMapper.xml
+++ b/screen-api/src/main/resources/mapper/ResponsibilityUnitMapper.xml
@@ -38,5 +38,8 @@
</select>
+ <select id="selectAreaCode" resultType="java.lang.String">
+ select area_code from responsibility_unit t where unit_id = #{id}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0