提交一把

jiangping

2024-06-27 977743d6833a970fb329bd9e5d409e9cb9e5115c

提交一把

 server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java

@@ -78,7 +78,7 @@
    @ExcelColumn(name="期望保险生效起期")
//    @DateTimeFormat(pattern = "yyyy-MM-dd")
//    @JsonFormat(pattern="yyyy-MM-dd")
    private Date applyStartTime;
    private Date  applyStartTime;

    @ApiModelProperty(value = "实际保险生效止期")
    @ExcelColumn(name="实际保险生效止期")

 server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java

@@ -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() )