From 701539ca54bf08267bbf669188797669b9335811 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 07 Nov 2023 16:49:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 235b1e7..2d858cf 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
@@ -70,6 +70,8 @@
private ResponsibilityUnitService responsibilityUnitService;
@Autowired
private SysDictTypeService sysDictTypeService;
+ @Autowired
+ private UserService userService;
/**
* ������������������������������������
@@ -132,6 +134,8 @@
}
//������������������
allocationMapper.insert(allocation);
+ //������������
+ userService.pushOneUser(allocation);
redisTemplate.opsForValue().set(RedisConstants.JBD_DATA,i);
if(NEW_BUILT.equals(allocationCond.getState())) {
//������������������
@@ -526,6 +530,9 @@
allocation.setState(changeCond.getState());
allocation.setChangeTime(new Date());
this.updateById(allocation);
+ //������������
+ Allocation allocation1 = this.getById(changeCond.getAllocationId());
+ userService.pushOneUser(allocation1);
//������������������
ApproveTable approveTable = new ApproveTable();
approveTable.setRelationId(allocation.getAllocationId());
@@ -787,9 +794,12 @@
//������������������
ApproveTable approveTable = new ApproveTable();
approveTable.setRelationId(allocation.getAllocationId());
+ approveTable.setState(NEW_BUILT);
+ approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
+ approveTable.setStateName("������");
+ approveTableService.saveResult(approveTable);
approveTable.setState(AllocationApproveEnum.UNDER_RECTIFICATION.value);
approveTable.setStateName(AllocationApproveEnum.UNDER_RECTIFICATION.name);
- approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
approveTableService.saveResult(approveTable);
fileTableService.upDateResult(changeCond.getFileChangeList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_RECTIFICATION.value);
}
@@ -842,7 +852,7 @@
if(CollectionUtils.isNotEmpty(userList)){
return true;
}
- if(Objects.nonNull(user.getUnitId())){
+ if(Objects.nonNull(user.getUnitId())&&user.getUnitId()!=0){
LambdaQueryWrapper<Allocation> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Allocation::getAllocationNum,allocationNum);
wrapper.eq(Allocation::getIsDel,0);
@@ -852,13 +862,13 @@
return true;
}
String code = responsibilityUnitMapper.selectAreaCode(user.getUnitId());
- if(code.length()>6){
+ if (code.length() > 6) {
return false;
- }else {
+ } else {
return true;
}
}
- return true;
+ return false;
}
@Override
@@ -883,15 +893,15 @@
if(CollectionUtils.isNotEmpty(userList)){
return 1;
}
- if(Objects.nonNull(user.getUnitId())){
+ if(Objects.nonNull(user.getUnitId())&&user.getUnitId()!=0) {
String code = responsibilityUnitMapper.selectAreaCode(user.getUnitId());
- if(code.length()>6){
+ if (code.length() > 6) {
return 0;
- }else {
+ } else {
return 2;
}
}
- return 1;
+ return 0;
}
private boolean escalationType(Integer id){
boolean f = false;
--
Gitblit v1.8.0