From c7be7e1fcd9bb0e813b78b08cd45191883af9ce3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 19 一月 2024 15:34:06 +0800
Subject: [PATCH] 111

---
 server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 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..0942fdd 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
@@ -277,6 +277,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 +363,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