From 27e41b5c21b4ba13178b2184c76c4d8cba0952b6 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 01 二月 2024 19:21:18 +0800
Subject: [PATCH] Mr.Shi
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
index 489a5ee..0d06fbd 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
@@ -522,19 +522,20 @@
applyLogType = Constants.ApplyLogType.CA_PALTFORM_REFUSE_APPLY;
info = applyLogType.getInfo();
info = info.replace("${param}", param.getCheckInfo());
- update.setStatus(Constants.ApplyChangeStatus.SIGNATURE.getKey());
+//
+ if( Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())){
+ update.setStatus(Constants.ApplyChangeStatus.SIGNATURE.getKey());
+ }else if( Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey())){
+ update.setStatus(Constants.ApplyChangeStatus.UPLOAD.getKey());
+ }
}else{
//濡傛灉鏄悓鎰�,涓ょ鐢宠閫�鍥炵姸鎬侀兘鍙搷浣�
if(!(Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())
||Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
- applyLogType = Constants.ApplyLogType.CA_PALTFORM_REFUSE_APPLY;
- if( Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())){
- update.setStatus(Constants.ApplyChangeStatus.SIGNATURE.getKey());
- }else if( Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey())){
- update.setStatus(Constants.ApplyChangeStatus.UPLOAD.getKey());
- }
+ update.setStatus(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey());
+ applyLogType = Constants.ApplyLogType.CA_PLATFORM_AGREE_BACK_APPLY;
}
update.setEditDate(new Date());
update.setEditor(user.getId());
@@ -1320,7 +1321,7 @@
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
Company company = user.getCompany();
if(debugModel){
-company = companyMapper.selectById(model.getCompanyId());
+ company = companyMapper.selectById(model.getCompanyId());
}
if(company== null || StringUtils.isBlank( company.getEmail()) || !Constants.equalsInteger(company.getSignStatus(),Constants.THREE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝浼佷笟灏氭湭鍏峰鍦ㄧ嚎绛剧珷鏉′欢锛岃鑱旂郴骞冲彴绠＄悊鍛樼‘璁");
--
Gitblit v1.9.3