From 1a8ae6726c4191057df1b0238fc2e551875bc89c Mon Sep 17 00:00:00 2001
From: luyincheng <1292122841@qq.com>
Date: Mon, 4 Dec 2023 09:11:07 +0800
Subject: [PATCH] 辅材申请审批问题
---
src/main/java/com/starcharge/wios/controller/TauxiliarymaterialsController.java | 41 ++++++++++++++++++++++++-----------------
1 file changed, 24 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/starcharge/wios/controller/TauxiliarymaterialsController.java b/src/main/java/com/starcharge/wios/controller/TauxiliarymaterialsController.java
index 361d685..df2306d 100644
--- a/src/main/java/com/starcharge/wios/controller/TauxiliarymaterialsController.java
+++ b/src/main/java/com/starcharge/wios/controller/TauxiliarymaterialsController.java
@@ -169,25 +169,10 @@ public class TauxiliarymaterialsController {
public BaseResponse<Boolean> checkApply(@RequestBody TauxiliarymaterialsCheckDto tauxiliarymaterialsCheckDto){
SessionInfo sessionInfo = tokenService.getUser();
tauxiliarymaterialsCheckDto.getTauxiliarymaterialsCheckVoList().stream()
- .filter(dto->{
- Tauxiliarymaterials exist=null;
- if(dto.getId()!=null&&dto.getId()>0){
- exist=this.tauxiliarymaterialsMapper.selectByPrimaryKey(dto.getId());
- }else if(StringUtils.hasLength(dto.getApplyOrder())){
- exist=this.tauxiliarymaterialsMapper.selectByApplyOrder(dto.getApplyOrder()); }
- if(exist==null){
- return false;
- }else{
- //已审批
- if(TauxiliarymaterialStatusEnum.getEnumByName(0,exist.getApplyStatus()).getValue()>1){
- return false;
- }
- }
- return true;
- })
.map(dto->{
var ta=new Tauxiliarymaterials();
ta.setId(dto.getId());
+ ta.setApplyOrder(dto.getApplyOrder());
ta.setApprovedQuantity(dto.getApprovedQuantity());
ta.setApplyStatus(tauxiliarymaterialsCheckDto.getApplyStatus());
ta.setCheckSuggestion(tauxiliarymaterialsCheckDto.getCheckSuggestion());
@@ -195,8 +180,30 @@ public class TauxiliarymaterialsController {
ta.setCheckUserName(sessionInfo.getUserName());
ta.setCheckTime(LocalDateTime.now());
UpdateColumns(ta);
+
+ Tauxiliarymaterials exist=null;
+ if(dto.getId()!=null&&dto.getId()>0){
+ exist=this.tauxiliarymaterialsMapper.selectByPrimaryKey(dto.getId());
+ }else if(StringUtils.hasLength(dto.getApplyOrder())){
+ exist=this.tauxiliarymaterialsMapper.selectByApplyOrder(dto.getApplyOrder());
+ }
+ if(exist==null){
+ throw new ServiceException(400,"找不到辅材申请单");
+ }else if(TauxiliarymaterialStatusEnum.getEnumByName(0,exist.getApplyStatus()).getValue()!=1){
+ throw new ServiceException(400,"辅材申请单:"+exist.getApplyOrder()+" 状态必须是已申请");
+ }else{
+ ta.setId(exist.getId());
+ }
return ta;
- }).forEach(ta->{
+ })
+ .filter(ta->{
+ if(ta.getId()==null||ta.getId()<=0){
+ return false;
+ }else{
+ return true;
+ }
+ })
+ .forEach(ta->{
this.tauxiliarymaterialsMapper.updateByPrimaryKeySelective(ta);
});
return new BaseResponse(true);
--
libgit2 0.26.0