From cc120d54e26f64753e99b349599875cf6911a0af Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 18 Oct 2023 08:26:19 +0800
Subject: [PATCH] chore:小程序测试提交
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 128 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 126 insertions(+), 2 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 1b2f9ac..1f66f94 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,6 @@
package com.moral.api.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.config.Interceptor.UserHelper;
@@ -10,10 +11,9 @@
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.approvetable.ApproveTableListVo;
+import com.moral.api.pojo.vo.allocation.AllocationFindVo;
import com.moral.api.pojo.vo.user.QxUser;
import com.moral.api.service.AllocationExtensionService;
import com.moral.api.service.ApproveTableService;
@@ -62,6 +62,7 @@
import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
import com.moral.util.TokenUtils;
+import com.sun.javafx.scene.control.skin.VirtualFlow;
@Service
@@ -636,6 +637,129 @@
}
@Override
+ public List<AllocationFindVo> selectSmallRoutine(Integer state,String startTime,String endTime) {
+ ArrayList<AllocationFindVo> allocationFindVos = new ArrayList<>();
+ LambdaQueryWrapper<Allocation> wrapper = new LambdaQueryWrapper<>();
+
+ //������������������
+ List<Integer> list = unitResult();
+ if (!ObjectUtils.isEmpty(list)){
+ Integer integer = list.get(0);
+ if (integer==0){
+ return null;
+ }else {
+ wrapper.in(Allocation::getUnitId,list);
+ }
+ }
+ Integer integer = unitAreaCode();
+ //��������������� ���������
+ if (integer==0 || integer==1){
+ if (state==3){
+ wrapper.in(Allocation::getState,40,50);
+ }else if (state==2){
+ wrapper.eq(Allocation::getState,30);
+ }else if (state==1){
+ wrapper.eq(Allocation::getState,20);
+ }
+ //������������
+ }else if (integer==2){
+ if (state==3){
+ wrapper.in(Allocation::getState,40,50);
+ }else if (state==2){
+ wrapper.eq(Allocation::getState,20);
+ }else if (state==1){
+ wrapper.eq(Allocation::getState,30);
+ }
+ }
+ if (!ObjectUtils.isEmpty(startTime) && !ObjectUtils.isEmpty(endTime)){
+ wrapper.between(Allocation::getEscalationTime,startTime,endTime);
+ }
+ wrapper.eq(Allocation::getIsDel,0).eq(Allocation::getIsInvalid,0);
+ List<Allocation> allocations = allocationMapper.selectList(wrapper);
+ for (Allocation allocation : allocations) {
+ AllocationFindVo allocationFindVo = new AllocationFindVo();
+ BeanUtils.copyProperties(allocation,allocationFindVo);
+ allocationFindVos.add(allocationFindVo);
+ }
+// List<AllocationFindVo> allocationFindVos = allocationMapper.selectSmallRoutine(state);
+ return allocationFindVos;
+ }
+
+ /**
+ * ���������������
+ *
+ * @param changeCond
+ */
+ @Override
+ @Transactional
+ public void changeSmallRoutine(AllocationChangeCond changeCond) {
+ Integer integer = unitAreaCode();
+ if (integer==1){
+ throw new BusinessException("���������������������������������������");
+ }
+ AllocationExt allocationExt = oneAllocation(changeCond.getAllocationId());
+ if(!AllocationApproveEnum.UNDER_RECTIFICATION.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_RECTIFICATION.value);
+ }
+
+ /**
+ * ���������������
+ *
+ * @param checkCond
+ */
+ @Override
+ @Transactional
+ public void checkSmallRoutine(AllocationCheckCond checkCond) {
+ Integer integer = unitAreaCode();
+ if (integer==0){
+ throw new BusinessException("���������������������������������������");
+ }
+ AllocationExt allocationExt = oneAllocation(checkCond.getAllocationId());
+ if(!AllocationApproveEnum.IN_APPROVAL.value.equals(allocationExt.getState())) {
+ throw new BusinessException("������������������������������������������");
+ }
+ 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());
+ 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(),checkCond.getAllocationId(), FileTableEnum.ALLOCATION_APPROVE.value);
+ }
+
+ @Override
public List<Integer> unitResult() {
QxUser user = UserHelper.getCurrentUser();
Integer unitId = Objects.nonNull(user.getUnitId())?user.getUnitId():0;
--
Gitblit v1.8.0