From fb759782181908c9d91054ad1da9c039b8fb0dab Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 28 Sep 2023 17:00:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 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 3ecdb0b..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
@@ -271,7 +271,7 @@
String state = allocation.getState()+"";
if (state.equals("40")||state.equals("50")){
complete++;
- }else if(state.equals("10")||state.equals("20") ||state.equals("30")) {
+ }else {
unComplete++;
}
}
@@ -357,9 +357,9 @@
rsMap.put("unitView",allocationUnitViewDtos);
//������
rsMap.put("total",allocations.size());
- //���������
+ //���������
rsMap.put("complete",complete);
- //������������
+ //���������
rsMap.put("unComplete",unComplete);
//������
rsMap.put("overdue",overdue);
@@ -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;
+ }
}
--
Gitblit v1.8.0