From 0e4aa8d08a3bf8e8683d05081baefdbf96ce080f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 08 Nov 2023 11:45:08 +0800
Subject: [PATCH] fix：小程序添加流程状态变更
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 124 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 117 insertions(+), 7 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 1dbffad..ff45f61 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
@@ -12,6 +12,7 @@
import com.moral.api.mapper.ResponsibilityUnitMapper;
import com.moral.api.mapper.SysDictDataMapper;
import com.moral.api.mapper.SysDictTypeMapper;
+import com.moral.api.mapper.UserMapper;
import com.moral.api.pojo.bean.BaseInvalidEntity;
import com.moral.api.pojo.dto.allocation.AllocationUnitViewDto;
import com.moral.api.pojo.enums.*;
@@ -20,7 +21,10 @@
import com.moral.api.pojo.ext.allocation.AllocationPageExt;
import com.moral.api.pojo.query.allocation.*;
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.app.AppAllocationFindVo;
import com.moral.api.pojo.vo.user.QxUser;
import com.moral.api.service.*;
import com.moral.constant.Constants;
@@ -66,6 +70,8 @@
private ResponsibilityUnitService responsibilityUnitService;
@Autowired
private SysDictTypeService sysDictTypeService;
+ @Autowired
+ private UserService userService;
/**
* ������������������������������������
@@ -120,7 +126,7 @@
//������
String allocationNum = "JBD-" + dateString + String.format("%04d", i);
allocation.setAllocationNum(allocationNum);
- if(Objects.nonNull(allocationCond.getEscalationUnitId())&& escalationType(allocationCond.getEscalationUnitId())) {
+ if(Objects.nonNull(allocationCond.getEscalationUnitId())&& !allocationCond.getEscalationUnitId().equals(allocationCond.getUnitId()) && escalationType(allocationCond.getEscalationUnitId())) {
allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
}
if(NEW_BUILT.equals(allocationCond.getState())) {
@@ -128,8 +134,10 @@
}
//������������������
allocationMapper.insert(allocation);
+ //������������
+ userService.pushOneUser(allocation);
redisTemplate.opsForValue().set(RedisConstants.JBD_DATA,i);
- if(NEW_BUILT.equals(allocationCond.getState())) {
+ if(NEW_BUILT.equals(allocationCond.getState())||AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(allocationCond.getState())) {
//������������������
ApproveTable approveTable = new ApproveTable();
approveTable.setRelationId(allocation.getAllocationId());
@@ -522,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());
@@ -687,6 +698,75 @@
return allocationFindVos;
}
+ @Override
+ public Page<AllocationPageExt> pageApp(AppAllocationPageCond allocationPageCond) {
+ List<Integer> listUnit = unitResult();
+ Integer integer = unitAreaCode();
+ allocationPageCond.setUnitList(listUnit);
+ allocationPageCond.setStateList(stateAllocationList(allocationPageCond.getState(),integer));
+ Page<AllocationPageExt> extAppPage = this.baseMapper.extAppPage(allocationPageCond.getPage().convertPage(),allocationPageCond);
+ extAppPage.getRecords().forEach(it->{
+ Integer state = it.getState();
+ if (state.equals(AllocationApproveEnum.DRAFT.value)||state.equals(AllocationApproveEnum.UNDER_RECTIFICATION.value)){
+ if(integer==0||integer==1){
+ it.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
+ }else if(integer==2){
+ it.setStateName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
+ }
+ }else if(state.equals(AllocationApproveEnum.IN_APPROVAL.value)){
+ if(integer==2||integer==1){
+ it.setStateName(AppAllocationStateEnum.TO_BE_PROCESSED.name);
+ }else if(integer==0){
+ it.setStateName(AppAllocationStateEnum.TO_BE_COMPLETED.name);
+ }
+ }else{
+ it.setStateName(AppAllocationStateEnum.COMPLETED.name);
+ }
+ });
+
+ return extAppPage;
+ }
+
+ @Override
+ @Transactional
+ public boolean saveFile(AppAllocationFileCond appAllocationFileCond) {
+ fileTableService.upDateResult(Arrays.asList(appAllocationFileCond.getFile()),appAllocationFileCond.getUserId(), FileTableEnum.APP_ALLOCATION.value);
+ return true;
+ }
+
+ private List<Integer> stateAllocationList(Integer type, Integer integer){
+ List<Integer> integerList = new ArrayList<>();
+ // type 0 ������ 1������ 2��������� 3 ���������
+ if(integer.equals(0)){
+ if(type.equals(1)){
+ integerList.add(AllocationApproveEnum.UNDER_RECTIFICATION.value);
+ integerList.add(AllocationApproveEnum.DRAFT.value);
+ }else if(type.equals(2)){
+ integerList.add(AllocationApproveEnum.IN_APPROVAL.value);
+ }
+ }else if(integer.equals(2)){
+ if(type.equals(1)){
+ integerList.add(AllocationApproveEnum.IN_APPROVAL.value);
+ }else if(type.equals(2)){
+ integerList.add(AllocationApproveEnum.UNDER_RECTIFICATION.value);
+ integerList.add(AllocationApproveEnum.DRAFT.value);
+ }
+ }else if(integer.equals(1)){
+ if(type.equals(1)){
+ integerList.add(AllocationApproveEnum.IN_APPROVAL.value);
+ integerList.add(AllocationApproveEnum.UNDER_RECTIFICATION.value);
+ integerList.add(AllocationApproveEnum.DRAFT.value);
+ }else if(type.equals(2)){
+ integerList.add(0);
+ }
+ }
+ if(type.equals(3)){
+ integerList.add(AllocationApproveEnum.PASS.value);
+ integerList.add(AllocationApproveEnum.REFUSE.value);
+ }
+ return integerList;
+ }
+
/**
* ���������������
*
@@ -714,9 +794,12 @@
//������������������
ApproveTable approveTable = new ApproveTable();
approveTable.setRelationId(allocation.getAllocationId());
+ approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
+ /* approveTable.setState(NEW_BUILT);
+ 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);
}
@@ -762,6 +845,33 @@
}
@Override
+ public boolean authority(String allocationNum,Integer userId) {
+ //������������������
+ QxUser user = UserHelper.getCurrentUser();
+ List<Integer> userList = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_JBD.getValue(),user.getUserId());
+ if(CollectionUtils.isNotEmpty(userList)){
+ return true;
+ }
+ if(Objects.nonNull(user.getUnitId())&&user.getUnitId()!=0){
+ LambdaQueryWrapper<Allocation> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(Allocation::getAllocationNum,allocationNum);
+ wrapper.eq(Allocation::getIsDel,0);
+ wrapper.eq(Allocation::getIsInvalid,0);
+ Allocation allocation = allocationMapper.selectOne(wrapper);
+ if (allocation.getUnitId().equals(user.getUnitId())){
+ return true;
+ }
+ String code = responsibilityUnitMapper.selectAreaCode(user.getUnitId());
+ if (code.length() > 6) {
+ return false;
+ } else {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
public List<Integer> unitResult() {
QxUser user = UserHelper.getCurrentUser();
Integer unitId = Objects.nonNull(user.getUnitId())?user.getUnitId():0;
@@ -783,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