From 3de94f9fd2e4354eec6e53eb1a6e466b20c896a7 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 19 一月 2024 15:36:31 +0800
Subject: [PATCH] 111
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 4cbbb7a..3860d1e 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
@@ -23,7 +23,6 @@
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import io.swagger.models.auth.In;
-import jdk.internal.jline.internal.Log;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -277,6 +276,13 @@
if (pageWrap.getModel().getStartTimeE() != null) {
queryWrapper.le(InsuranceApply::getStartTime, Utils.Date.getEnd(pageWrap.getModel().getStartTimeE()));
}
+ if (pageWrap.getModel().getCreateTimeS() != null) {
+ queryWrapper.ge(InsuranceApply::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateTimeS()));
+ }
+ if (pageWrap.getModel().getCreateTimeE() != null) {
+ queryWrapper.le(InsuranceApply::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateTimeE()));
+ }
+
if (pageWrap.getModel().getCode() != null) {
queryWrapper.eq(InsuranceApply::getCode, pageWrap.getModel().getCode());
}
@@ -356,13 +362,14 @@
||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀潪鍙敵璇烽��鍥�!");
}
+ Constants.InsuranceApplyStatus insuranceApplyStatus = Constants.InsuranceApplyStatus.COMPANY_APPLY_RETURN;
+ insuranceApply.setStatus(insuranceApplyStatus.getKey());
insuranceApply.setCheckDate(new Date());
insuranceApply.setCheckInfo(insuranceApplyOptDTO.getOptIllustration());
insuranceApply.setCheckUserId(loginUserInfo.getId());
insuranceApplyMapper.updateById(insuranceApply);
-
//瀛樺偍鏃ュ織鏁版嵁
- this.saveApplyLog(insuranceApply,Constants.InsuranceApplyStatus.COMPANY_APPLY_RETURN,null);
+ this.saveApplyLog(insuranceApply,insuranceApplyStatus,null);
}
--
Gitblit v1.9.3