From 9ff80d30c433c274dac4a2d07bbbbb7ec3cc6122 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 26 Sep 2023 11:21:41 +0800
Subject: [PATCH] fix:交办清单提交
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 241 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 185 insertions(+), 56 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 33f7f1e..8fcf46e 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
@@ -1,5 +1,21 @@
package com.moral.api.service.impl;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.moral.api.config.Interceptor.UserHelper;
+import com.moral.api.entity.*;
+import com.moral.api.exception.BusinessException;
+import com.moral.api.pojo.bean.BaseInvalidEntity;
+import com.moral.api.pojo.enums.*;
+import com.moral.api.pojo.ext.allocation.AllocationExt;
+import com.moral.api.pojo.ext.allocation.AllocationListExt;
+import com.moral.api.pojo.ext.allocation.AllocationPageExt;
+import com.moral.api.pojo.query.PageCond;
+import com.moral.api.pojo.query.allocation.*;
+import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;
+import com.moral.api.pojo.vo.user.QxUser;
+import com.moral.api.service.AllocationExtensionService;
+import com.moral.api.service.ApproveTableService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -8,27 +24,16 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.moral.api.entity.Allocation;
-import com.moral.api.entity.ApproveTable;
-import com.moral.api.entity.ResponsibilityUnit;
-import com.moral.api.entity.SysDictData;
-import com.moral.api.entity.SysDictType;
import com.moral.api.mapper.AllocationMapper;
-import com.moral.api.mapper.ApproveTableMapper;
import com.moral.api.mapper.ResponsibilityUnitMapper;
-import com.moral.api.mapper.SysAreaMapper;
import com.moral.api.mapper.SysDictDataMapper;
import com.moral.api.mapper.SysDictTypeMapper;
import com.moral.api.pojo.dto.allocation.AllocationUnitDto;
-import com.moral.api.pojo.vo.file.FileVo;
import com.moral.api.service.AllocationService;
import com.moral.api.service.FileTableService;
import com.moral.constant.Constants;
@@ -52,7 +57,11 @@
@Autowired
private AllocationMapper allocationMapper;
@Autowired
- private ApproveTableMapper approveTableMapper;
+ private ApproveTableService approveTableService;
+ @Autowired
+ private FileTableService fileTableService;
+ @Autowired
+ private AllocationExtensionService allocationExtensionService;
/**
* ������������������������������������
@@ -93,53 +102,43 @@
/**
* ���������������
- * @param allocation
+ * @param allocationCond
* @return
*/
@Override
@Transactional
- public Integer insertAllocation(Allocation allocation) {
- ApproveTable approveTable = new ApproveTable();
- //������������������
- Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
+ public Integer insertAllocation(AllocationAddCond allocationCond) {
+ Allocation allocation = allocationCond.convert();
+ allocation.setEscalationType(AllocationEscalationTypeEnum.SELF.getValue());
String dateString = DateUtils.dateToDateString(new Date(), DateUtils.yyyyMMdd_EN);
- QueryWrapper<Allocation> wrapper = new QueryWrapper<>();
Object o = redisTemplate.opsForValue().get(RedisConstants.JBD_DATA);
int i;
if (ObjectUtils.isEmpty(o)){
- wrapper.last("limit 1");
- Allocation selectOne = allocationMapper.selectOne(wrapper);
- String allocationNum = selectOne.getAllocationNum();
- String num = allocationNum.substring(10);
- i = Integer.parseInt(num)+1;
+ i = 1;
}else {
i = Integer.parseInt(o.toString()) + 1;
}
//������
String allocationNum = "JBD" + dateString + String.format("%04d", i);
allocation.setAllocationNum(allocationNum);
- allocation.setIsDel("0");
- allocation.setIsInvalid("0");
- allocation.setCreateId(Integer.parseInt(userInfo.get("userId").toString()));
- allocation.setCreateTime(new Date());
- allocation.setCreateName(userInfo.get("account").toString());
- allocation.setUpdateId(Integer.parseInt(userInfo.get("userId").toString()));
- allocation.setUpdateTime(new Date());
- allocation.setUpdateName(userInfo.get("account").toString());
+ if(Objects.nonNull(allocationCond.getEscalationUnitId())&&allocationCond.getEscalationUnitId().toString().length()==6) {
+ allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
+ }
//������������������
allocationMapper.insert(allocation);
-
redisTemplate.opsForValue().set(RedisConstants.JBD_DATA,i);
- //������������������
- approveTable.setRelationId(allocation.getAllocationId());
- approveTable.setState(Integer.parseInt(allocation.getState()));
- approveTable.setApproveModule(null);
- approveTable.setStateName(null);
- approveTable.setIsDel(0);
- approveTableMapper.insert(approveTable);
- return null;
+ if(AllocationApproveEnum.NEW_BUILT.value.equals(allocationCond.getState())) {
+ //������������������
+ ApproveTable approveTable = new ApproveTable();
+ approveTable.setRelationId(allocation.getAllocationId());
+ approveTable.setState(AllocationApproveEnum.NEW_BUILT.value);
+ approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
+ approveTable.setStateName(AllocationApproveEnum.NEW_BUILT.name);
+ approveTableService.saveResult(approveTable);
+ }
+ fileTableService.upDateResult(allocationCond.getFileBaseList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_FOUNDATION.value);
+ return allocation.getAllocationId();
}
-
/**
* ������������
@@ -164,29 +163,36 @@
}
allocationUnitDto.setChangeTypeName(allocation.getChangeType()==0?"������������":"������������");
allocationUnitDto.setInvestigationTypeName(allocation.getChangeType()==0?"������":"���������");
-
//������������
return allocationUnitDto;
}
/**
* ���������������
- * @param allocation
+ * @param allocationUpdateCond
*/
@Override
- public void updateAll(Allocation allocation) {
- //������������������
- Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
- if (allocation.getState().equals("1")){
- //������������������
- allocation.setChangeTime(new Date());
- }else {
- //������������������
- allocation.setCheckTime(new Date());
+ @Transactional
+ public void updateAll(AllocationUpdateCond allocationUpdateCond) {
+ AllocationExt allocationExt = oneAllocation(allocationUpdateCond.getAllocationId());
+ if(!AllocationApproveEnum.DRAFT.value.equals(allocationExt.getState())) {
+ throw new BusinessException("���������������������������������������");
}
- allocation.setUpdateId(Integer.parseInt(userInfo.get("userId").toString()));
- allocation.setUpdateTime(new Date());
- allocation.setUpdateName(userInfo.get("account").toString());
+ //������������������
+ Allocation allocation = allocationUpdateCond.convert();
+ if(Objects.nonNull(allocationUpdateCond.getEscalationUnitId())&&allocationUpdateCond.getEscalationUnitId().toString().length()==6) {
+ allocation.setEscalationType(AllocationEscalationTypeEnum.CHECK.getValue());
+ }
+ if(AllocationApproveEnum.NEW_BUILT.value.equals(allocationUpdateCond.getState())) {
+ //������������������
+ ApproveTable approveTable = new ApproveTable();
+ approveTable.setRelationId(allocation.getAllocationId());
+ approveTable.setState(AllocationApproveEnum.NEW_BUILT.value);
+ approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
+ approveTable.setStateName(AllocationApproveEnum.NEW_BUILT.name);
+ approveTableService.saveResult(approveTable);
+ }
+ fileTableService.upDateResult(allocationUpdateCond.getFileBaseList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_FOUNDATION.value);
allocationMapper.updateById(allocation);
}
@@ -252,4 +258,127 @@
}
return null;
}
+
+ @Override
+ public Page<AllocationPageExt> extPage(AllocationPageCond allocationPageCond) {
+ return this.baseMapper.extPage(allocationPageCond.getPage().convertPage(), allocationPageCond);
+ }
+
+ @Override
+ public AllocationExt extOne(Integer id) {
+ AllocationExt allocationExt = oneAllocation(id);
+ allocationExt.setFileBaseList(fileTableService.list(id,FileTableEnum.ALLOCATION_FOUNDATION.value));
+ allocationExt.setFileChangeList(fileTableService.list(id,FileTableEnum.ALLOCATION_RECTIFICATION.value));
+ allocationExt.setFileApproveList(fileTableService.list(id,FileTableEnum.ALLOCATION_APPROVE.value));
+ allocationExt.setApproveList(approveTableService.listAll(id,FileTableEnum.ALLOCATION_FOUNDATION.value));
+ return allocationExt;
+ }
+
+ private AllocationExt oneAllocation(Integer id){
+ return this.baseMapper.extOne(id);
+ }
+
+ @Override
+ @Transactional
+ public void changeAllocation(AllocationChangeCond changeCond) {
+ AllocationExt allocationExt = oneAllocation(changeCond.getAllocationId());
+ if(!AllocationApproveEnum.NEW_BUILT.value.equals(allocationExt.getState())) {
+ throw new BusinessException("������������������������������������");
+ }
+ Allocation allocation = new Allocation();
+ allocation.setAllocationId(changeCond.getAllocationId());
+ allocation.setIsChange(changeCond.getIsChange());
+ allocation.setChangeName(changeCond.getChangeName());
+ allocation.setChangeDescribe(changeCond.getChangeDescribe());
+ allocation.setState(changeCond.getState());
+ allocation.setChangeTime(new Date());
+ this.updateById(allocation);
+ //������������������
+ ApproveTable approveTable = new ApproveTable();
+ approveTable.setRelationId(allocation.getAllocationId());
+ 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_FOUNDATION.value);
+ }
+
+ @Override
+ @Transactional
+ public void checkAllocation(AllocationCheckCond checkCond) {
+ AllocationExt allocationExt = oneAllocation(checkCond.getAllocationId());
+ if(!AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(allocationExt.getState())) {
+ throw new BusinessException("������������������������������������");
+ }
+ QxUser qxUser = UserHelper.getCurrentUser();
+ Allocation allocation = new Allocation();
+ allocation.setCheckScore(checkCond.getCheckScore());
+ allocation.setCheckDescribe(checkCond.getCheckDescribe());
+ allocation.setCheckName(qxUser.getUserName());
+ allocation.setCheckTime(new Date());
+ allocation.setState(checkCond.getState());
+ this.updateById(allocation);
+ //������������������
+ ApproveTable approveTable = new ApproveTable();
+ approveTable.setRelationId(allocation.getAllocationId());
+ if(AllocationApproveEnum.PASS.value.equals(checkCond.getState())){
+ approveTable.setState(AllocationApproveEnum.PASS.value);
+ approveTable.setStateName(AllocationApproveEnum.PASS.name);
+ }else {
+ approveTable.setState(AllocationApproveEnum.REFUSE.value);
+ approveTable.setStateName(AllocationApproveEnum.REFUSE.name);
+ }
+ approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
+ approveTableService.saveResult(approveTable);
+ fileTableService.upDateResult(checkCond.getFileApproveList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_FOUNDATION.value);
+ }
+
+ @Override
+ @Transactional
+ public boolean removeById(Integer id) {
+ AllocationExt allocationExt = oneAllocation(id);
+ if(!AllocationApproveEnum.DRAFT.value.equals(allocationExt.getState())) {
+ throw new BusinessException("������������������������������������");
+ }
+ this.baseMapper.deleteById(id);
+ return true;
+ }
+
+ @Override
+ @Transactional
+ public boolean invalidResult(Integer id,String invalidReason) {
+ AllocationExt allocationExt = oneAllocation(id);
+ if( AllocationApproveEnum.IN_APPROVAL.value >= allocationExt.getState() ) {
+ throw new BusinessException("���������������������������");
+ }
+ LambdaUpdateChainWrapper<Allocation> wrapper =lambdaUpdate();
+ wrapper.eq(Allocation::getAllocationId,id).set(Allocation::getInvalidReason,invalidReason).set(BaseInvalidEntity::getIsInvalid, YesOrNo.YES.value);
+ return wrapper.update();
+ }
+
+ @Override
+ public List<AllocationListExt> extList(AllocationListCond allocationListCond) {
+ return null;
+ }
+
+ @Override
+ @Transactional
+ public boolean applyFor(AllocationExtensionAddCond allocationExtensionAddCond) {
+ AllocationExt allocationExt = oneAllocation(allocationExtensionAddCond.getAllocationId());
+ boolean type = false;
+ if( !AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(allocationExt.getState())) {
+ type = true;
+ }
+ if(!ChangeEnum.DEADLINE.value.equals(allocationExt.getState())){
+ type = true;
+ }
+ if(type){
+ throw new BusinessException("���������������������������������������������������������������������������");
+ }
+ AllocationExtension allocationExtension = allocationExtensionAddCond.convert();
+ allocationExtension.setState(AllocationExtensionApproveEnum.APPLYING.value);
+ allocationExtensionService.save(allocationExtension);
+ fileTableService.upDateResult(allocationExtensionAddCond.getFileList(),allocationExtension.getId(), FileTableEnum.ALLOCATION_EXTENSION.value);
+ return true;
+ }
}
--
Gitblit v1.8.0