From 94b15dee8f8a9d181f14e99eaa620e52f197ee35 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 30 七月 2024 15:22:53 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
index cb5f934..84a212d 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -1950,8 +1950,8 @@
}
member.setIdcardNo(applyDetail.getIdcardNo());
member.setApplyId(insuranceApply.getId());
- member.setStartTime(applyDetail.getStartTime());
- member.setEndTime(applyDetail.getEndTime());
+// member.setStartTime(applyDetail.getStartTime());
+// member.setEndTime(applyDetail.getEndTime());
member.setDuId(applyDetail.getDuId());
member.setWorktypeId(applyDetail.getWorktypeId());
addMemberList.add(member);
@@ -1994,8 +1994,8 @@
member.setApplyId(insuranceApply.getId());
member.setDuId(applyDetail.getDuId());
member.setWorktypeId(applyDetail.getWorktypeId());
- member.setStartTime(applyDetail.getStartTime());
- member.setEndTime(applyDetail.getEndTime());
+// member.setStartTime(applyDetail.getStartTime());
+// member.setEndTime(applyDetail.getEndTime());
memberMapper.updateById(member);
}
}else{
@@ -2006,8 +2006,8 @@
member.setApplyId(insuranceApply.getId());
member.setDuId(applyDetail.getDuId());
member.setWorktypeId(applyDetail.getWorktypeId());
- member.setStartTime(applyDetail.getStartTime());
- member.setEndTime(applyDetail.getEndTime());
+// member.setStartTime(applyDetail.getStartTime());
+// member.setEndTime(applyDetail.getEndTime());
memberMapper.updateById(member);
}
@@ -2062,6 +2062,7 @@
.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId)
.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
.eq(ApplyDetail::getIdcardNo,idCode)
+ .eq(ApplyDetail::getIsdeleted,Constants.ZERO)
.eq(Solutions::getBaseId,solutionId)
.ne(Objects.nonNull(applyId),InsuranceApply::getId,applyId)
.notIn(InsuranceApply::getStatus
@@ -2094,6 +2095,7 @@
.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
.eq(ApplyDetail::getIdcardNo,idCode)
.eq(Solutions::getBaseId,solutionId)
+ .eq(ApplyDetail::getIsdeleted,Constants.ZERO)
.notIn(InsuranceApply::getStatus
,Constants.InsuranceApplyStatus.CLOSE.getKey()
,Constants.InsuranceApplyStatus.WTB_CLOSED.getKey() )
--
Gitblit v1.9.3