From 6d784d07cb846fff146c05be086137d923702c67 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 29 十月 2024 13:51:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java
index 82c9775..eb90dbe 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java
@@ -399,10 +399,17 @@
|| saveUnionChangeDTO.getAddValidDate().getTime()> unionApply.getEndTime().getTime()){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鍔犱繚鐢熸晥鏈熼敊璇�");
}
- if(saveUnionChangeDTO.getDelValidDate().getTime()<unionApply.getStartTime().getTime()
- || saveUnionChangeDTO.getDelValidDate().getTime()> unionApply.getEndTime().getTime()){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鍑忎繚鐢熸晥鏈熼敊璇�");
- }
+
+ //鍔犲叆 鏌ヨ鏄惁瀛樺湪鍑忎繚鐨勬暟鎹� 濡傛灉瀛樺湪鍑忎繚鏁版嵁 杩涜璇ユ棩鏈熺殑鍒ゆ柇 2024骞�7鏈�30鏃�16:38:18
+ if(applyChagneDetailJoinMapper.selectCount(new QueryWrapper<ApplyChagneDetail>().lambda()
+ .eq(ApplyChagneDetail::getType,Constants.ONE)
+ .in(ApplyChagneDetail::getApplyChangeId,saveUnionChangeDTO.getApplyIds()))>Constants.ZERO){
+ if(saveUnionChangeDTO.getDelValidDate().getTime()<unionApply.getStartTime().getTime()
+ || saveUnionChangeDTO.getDelValidDate().getTime()> unionApply.getEndTime().getTime()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鍑忎繚鐢熸晥鏈熼敊璇�");
+ }
+ };
+
}else{
if(saveUnionChangeDTO.getApplyDate().getTime()<DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
|| saveUnionChangeDTO.getApplyDate().getTime()> unionApply.getEndTime().getTime()){
@@ -410,7 +417,6 @@
}
saveUnionChangeDTO.setAddValidDate(saveUnionChangeDTO.getApplyDate());
}
-
List<ApplyChange> applyChangeList = applyChangeJoinMapper.selectJoinList(ApplyChange.class,
new MPJLambdaWrapper<ApplyChange>()
@@ -421,7 +427,7 @@
.eq(ApplyChange::getStatus,Constants.ApplyChangeStatus.CHECHED_PASSED.getKey())
.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_DONE.getKey())
.eq(ApplyChange::getType,saveUnionChangeDTO.getBusinessType())
- .le(InsuranceApply::getStartTime,DateUtil.getCurrDateTime())
+// .le(InsuranceApply::getStartTime,DateUtil.getCurrDateTime())
.in(ApplyChange::getId,saveUnionChangeDTO.getApplyIds())
.isNull(ApplyChange::getUnionChangeId)
);
--
Gitblit v1.9.3