From 81a82c8a3f32f80c4c51bdbbc2914615444685d9 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 28 Sep 2023 10:04:52 +0800
Subject: [PATCH] ci:持续修改
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 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 467cc88..d72e2ec 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
@@ -115,11 +115,11 @@
wrapper.eq("is_del",Constants.NOT_DELETE);
wrapper.eq("state",0);
wrapper.eq("is_invalid",0);
+
//������������������
- Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
- Object code = userInfo.get("code");
- if (!ObjectUtils.isEmpty(code)){
- wrapper.eq("area_code",code);
+ List<Integer> unitList = unitResult();
+ if (CollectionUtils.isNotEmpty(unitList)){
+ wrapper.in("unit_id",unitList);
}
List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitMapper.selectList(wrapper);
return responsibilityUnits;
@@ -221,6 +221,9 @@
approveTable.setStateName(AllocationApproveEnum.NEW_BUILT.name);
approveTableService.saveResult(approveTable);
}
+ if(AllocationApproveEnum.NEW_BUILT.value.equals(allocationUpdateCond.getState())) {
+ allocation.setState(AllocationApproveEnum.UNDER_RECTIFICATION.value);
+ }
fileTableService.upDateResult(allocationUpdateCond.getFileBaseList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_FOUNDATION.value);
allocationMapper.updateById(allocation);
}
@@ -302,11 +305,6 @@
Object unitId = userInfo.get("unitId");
Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
Integer orgId = (Integer) orgInfo.get("id");
-// Integer unitId= 17;
- if (ObjectUtils.isEmpty(unitId)){
- return null;
- }
-
if (!ObjectUtils.isEmpty(map.get("unitId"))){
wrapper.in("unit_id",map.get("unitId").toString());
}else {
@@ -323,6 +321,12 @@
Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits.stream().collect(Collectors.groupingBy(o -> o.getUnitId()));
List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList());
wrapper.in("unit_id",collect1);
+ }
+ }else if(orgId==24) {
+
+ }else {
+ if (ObjectUtils.isEmpty(unitId)){
+ return null;
}
}
}
@@ -646,7 +650,7 @@
approveTable.setStateName(AllocationApproveEnum.UNDER_RECTIFICATION.name);
approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
approveTableService.saveResult(approveTable);
- fileTableService.upDateResult(changeCond.getFileChangeList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_FOUNDATION.value);
+ fileTableService.upDateResult(changeCond.getFileChangeList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_RECTIFICATION.value);
}
@Override
@@ -659,6 +663,7 @@
QxUser qxUser = UserHelper.getCurrentUser();
Allocation allocation = new Allocation();
allocation.setCheckScore(checkCond.getCheckScore());
+ allocation.setAllocationId(checkCond.getAllocationId());
allocation.setCheckDescribe(checkCond.getCheckDescribe());
allocation.setCheckName(qxUser.getUserName());
allocation.setCheckTime(new Date());
@@ -676,7 +681,7 @@
}
approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
approveTableService.saveResult(approveTable);
- fileTableService.upDateResult(checkCond.getFileApproveList(),checkCond.getAllocationId(), FileTableEnum.ALLOCATION_FOUNDATION.value);
+ fileTableService.upDateResult(checkCond.getFileApproveList(),checkCond.getAllocationId(), FileTableEnum.ALLOCATION_APPROVE.value);
}
@Override
--
Gitblit v1.8.0