From b79a39d92db3baae7c3c8587e2858561bec0d6ca Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 17 四月 2024 14:37:34 +0800
Subject: [PATCH] mrshi
---
server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 79b5655..424214c 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
@@ -365,7 +365,7 @@
}
//鍒ゆ柇鎵瑰崟鏃ユ湡 鍚堝苟鍗曠殑鎵瑰崟鐢熸晥鏈熷湪涓� 淇濆崟璧锋湡鐨勬鏃� 鍒颁繚鍗曟鏈�
//鑾峰彇寮�濮嬫棩鏈熸鏃�
- if(saveUnionChangeDTO.getApplyDate().getTime()<=DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
+ if(saveUnionChangeDTO.getApplyDate().getTime()<DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
|| saveUnionChangeDTO.getApplyDate().getTime()> unionApply.getEndTime().getTime()){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鐢熸晥鏈熼敊璇�");
}
@@ -648,7 +648,7 @@
}
//鍒ゆ柇鎵瑰崟鏃ユ湡 鍚堝苟鍗曠殑鎵瑰崟鐢熸晥鏈熷湪涓� 淇濆崟璧锋湡鐨勬鏃� 鍒颁繚鍗曟鏈�
//鑾峰彇寮�濮嬫棩鏈熸鏃�
- if(unionChangeBXDDTO.getApplyDate().getTime()<=DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
+ if(unionChangeBXDDTO.getApplyDate().getTime()<DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
|| unionChangeBXDDTO.getApplyDate().getTime()> unionApply.getEndTime().getTime()){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鐢熸晥鏈熼敊璇�");
}
@@ -685,6 +685,10 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵瑰崟鏄庣粏璁板綍瀛樺湪闈炴湰鍚堝苟鍗曟暟鎹�");
};
for (Multifile m:unionChangeBXDDTO.getApplyChangeBXDList()) {
+ if(StringUtils.isBlank(m.getName())
+ || StringUtils.isBlank(m.getFileurl()) ){
+ continue;
+ }
if(Objects.isNull(m.getObjId())
||StringUtils.isBlank(m.getFileurl())
||StringUtils.isBlank(m.getName())
@@ -998,7 +1002,7 @@
//淇敼 鍛樺伐鎶曚繚鏄庣粏璁板綍 鍘嗗彶鏁版嵁
memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
- .set(MemberInsurance::getEndTime,applyStartTime)
+ .set(MemberInsurance::getEndTime,DateUtil.getMontageDate(applyStartTime,3))
.set(MemberInsurance::getFee,oldFee)
.eq(MemberInsurance::getRelationId,oldModel.getId())
);
@@ -1028,7 +1032,7 @@
add.setFromId(detail.getId());
applyDetailJoinMapper.insert(add);
- MemberInsurance memberInsurance = new MemberInsurance(oldModel,applyChange.getId());
+ MemberInsurance memberInsurance = new MemberInsurance(add,applyChange.getId());
memberInsurance.setSolutionId(detail.getSolutionId());
memberInsurance.setWorktypeName(detail.getWorkTypeName());
memberInsurance.setDuName(detail.getDuName());
--
Gitblit v1.9.3