From 5725e0d4bcbc3aa721c1672f43d3e5fa6f06bb2b Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 03 四月 2024 14:02:56 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 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 1ae0751..afb0e78 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
@@ -135,13 +135,17 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌鏂规淇℃伅");
}
- if(
-// Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.UPLOAD.getKey())
-// ||Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.SIGNATURE.getKey())
-// ||
- Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.APPROVE.getKey())){
- //宸叉彁浜ゅ拰宸插畬鎴愮姸鎬佷笉鏀寔瀹℃牳涓嶉�氳繃
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+ if(Constants.equalsInteger(solutions.getType(),Constants.ZERO)){
+ if(Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.APPROVE.getKey())){
+ //宸叉彁浜ゅ拰宸插畬鎴愮姸鎬佷笉鏀寔瀹℃牳涓嶉�氳繃
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+ }
+ }else if(Constants.equalsInteger(solutions.getType(),Constants.ZERO)){
+ if(Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.UPLOAD.getKey())
+ || Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.SIGNATURE.getKey()) ){
+ //宸叉彁浜ゅ拰宸插畬鎴愮姸鎬佷笉鏀寔瀹℃牳涓嶉�氳繃
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+ }
}
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
ApplyChange update = new ApplyChange();
@@ -1606,14 +1610,11 @@
}else if(applyChangeOptDTO.getOptType().equals(6)){
//浼佷笟鍏抽棴
applyLogType = Constants.ApplyLogType.CA_COMPANY_CLOSE;
- if(!loginUserInfo.getType().equals(Constants.ONE)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
- }
- if(!applyChange.getStatus().equals(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey())){
+ if(!(applyChange.getStatus().equals(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey())
+ ||applyChange.getStatus().equals(Constants.ApplyChangeStatus.CHECHED_PASSED.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀敊璇棤娉曡繘琛岃鎿嶄綔!");
}
applyChange.setStatus(Constants.ApplyChangeStatus.CLOSE.getKey());
-
//瀛樺偍寰呭姙淇℃伅
//鍒犻櫎鍏朵粬寰呭姙
noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,applyChange.getId()));
@@ -1673,7 +1674,7 @@
applyChange.setApplyLogList(applyLogList);
List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
- .eq(Multifile::getObjId,Constants.equalsInteger(applyChange.getSolutionType(),Constants.ZERO)? applyChange.getId():applyChange.getUnionChangeId())
+ .eq(Multifile::getObjId, applyChange.getId() )
.in(Multifile::getObjType, Arrays.asList(new Integer[]{Constants.MultiFile.CA_APPLY_JIAJIAN_SIGN.getKey()
,Constants.MultiFile.CA_PD_PDF.getKey()
,Constants.MultiFile.CA_APPLY_CHANGEUNIT_SIGN.getKey()}))
@@ -1991,7 +1992,7 @@
}
ApplyChange model = this.queryApplyChangeData(smsCheckDTO.getBusinessId());
if(Objects.isNull(model)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠姞鍑忎繚淇℃伅");
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠姞鍑忎繚/鎹㈠巶淇℃伅");
}
if(Objects.isNull(model) ||! Constants.equalsInteger(Constants.ZERO,model.getIsdeleted())){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
@@ -2034,7 +2035,14 @@
applyChangeMapper.updateById(update);
return link;
}else{
- return this.getSignLinkJiajiabao(model);
+ if(model.getType().equals(Constants.ONE)){
+ return this.getSignLinkChangeUnit(model);
+ }else{
+ return this.getSignLinkJiajiabao(model);
+ }
+
+
+
}
}
@@ -2085,7 +2093,7 @@
//濡傛灉鏄笉閫氳繃
update.setStatus(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey());
}else{
- update.setStatus(Constants.ApplyChangeStatus.COMPANY_SIGN.getKey());
+ update.setStatus(Constants.ApplyChangeStatus.CHECHED_PASSED.getKey());
}
applyChangeJoinMapper.updateById(update);
Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
--
Gitblit v1.9.3