From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
index f1b227b..041f4ed 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
@@ -2,15 +2,17 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.ApproveParamMapper;
import com.doumee.dao.business.ApproveTemplMapper;
+import com.doumee.dao.business.PlatformReasonMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.service.business.ApproveTemplService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -26,6 +28,7 @@
import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 瀹℃壒妯＄増淇℃伅琛⊿ervice瀹炵幇
@@ -41,6 +44,8 @@
private ApproveParamMapper approveParamMapper;
@Autowired
private MemberJoinMapper memberJoinMapper;
+ @Autowired
+ private PlatformReasonMapper platformReasonMapper;
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
@@ -52,9 +57,21 @@
if(model.getType() == null || Constants.ApproveTmplType.getName(model.getType()) == null){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ PlatformReason reason = null;
+ if(Constants.equalsInteger(model.getType(),Constants.ApproveTmplType.PLATFROM_REASON.getKey())){
+ if(model.getReasonId() ==null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ reason = platformReasonMapper.selectById(model.getReasonId());
+ if(reason ==null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鍏ュ洯鍘熷洜淇℃伅涓嶅瓨鍦紝璇疯繑鍥炲埛鏂伴〉闈㈤噸璇曪紒");
+ }
+ }
ApproveTempl template = approveTemplMapper.selectOne(new QueryWrapper<ApproveTempl>().lambda()
.eq(ApproveTempl::getType,model.getType() )
.eq(ApproveTempl::getIsdeleted,Constants.ZERO)
+ //濡傛灉鏄叆鍥師鍥犻厤缃紝鏍规嵁ID鏌ヨ瀵瑰簲鐨勬ā鐗堜俊鎭�
+ .eq(Constants.equalsInteger(model.getType(),Constants.ApproveTmplType.PLATFROM_REASON.getKey()),ApproveTempl::getId,model.getReasonId())
.last("limit 1"));
Date date =new Date();
if(template == null){
@@ -73,6 +90,7 @@
if(model.getParamList()!=null && model.getParamList().size()>0){
for(ApproveParam param : model.getParamList()){
param.setCreateDate(date);
+ param.setId(null);
param.setCreator(loginUserInfo.getId());
param.setEditDate(date);
param.setEditor(loginUserInfo.getId());
@@ -83,7 +101,7 @@
param.setType(Constants.formatIntegerNum(param.getType()));
param.setAddrParam(Constants.formatIntegerNum(param.getAddrParam()));
param.setDriverParam(Constants.formatIntegerNum(param.getDriverParam()));
- param.setApproveType(Constants.formatIntegerNum(param.getApproveType()));
+ param.setApproveType(Objects.isNull(param.getApproveType())?Constants.TWO:param.getApproveType());
level ++ ;
}
//鍏堟竻闄ゅ師鏉ユ墍鏈夌殑灏遍櫔閰嶇疆
@@ -92,6 +110,14 @@
//鎵归噺鎻掑叆鏂扮殑閰嶇疆
approveParamMapper.insert(model.getParamList());
}
+ if(Constants.equalsInteger(model.getType(),Constants.ApproveTmplType.PLATFROM_REASON.getKey())){
+ PlatformReason r = new PlatformReason();
+ r.setApproveTemplId(template.getId());
+ r.setId(model.getReasonId());
+ r.setEditor(template.getEditor());
+ r.setEditDate(new Date());
+ platformReasonMapper.updateById(r);
+ }
return 1;
}
--
Gitblit v1.9.3