fix(苏商银行)：字典类

src/main/java/com/sunxung/factoring/service/financing/contract/impl/ContractMakingServiceImpl.java

@@ -661,7 +661,7 @@ public class ContractMakingServiceImpl implements ContractMakingService {
                         throw new BusinessException(CodeUtil.FAIL,"该供应商在苏商银行的授信已过期，请先完成苏商续授信！");
                     }
                     smbContractInfos = smbContractInfos.stream()
-                            .filter(r -> r.getGmtCreate().after(financingFromInvestorsNotice.getEffectiveDate()) && r.getGmtCreate().before(financingFromInvestorsNotice.getExpiringDate()) && r.getSignStatus()).collect(Collectors.toList());
+                            .filter(r -> r.getGmtCreate().before(financingFromInvestorsNotice.getExpiringDate()) && r.getSignStatus()).collect(Collectors.toList());
                     if(CollectionUtil.isEmpty(smbContractInfos)){
                         Dictionary dictionaryNew = new Dictionary();
                         dictionaryNew.setCode(contractTemplate.getTemplateCode());
@@ -1002,7 +1002,7 @@ public class ContractMakingServiceImpl implements ContractMakingService {
             List<FinancingFromInvestorsHistory> financingFromInvestorsHistories = financingFromInvestorsHistoryService.lambdaQuery().eq(FinancingFromInvestorsHistory::getSupplierInfoId, supplierInfo.getId()).orderByDesc(FinancingFromInvestorsHistory::getId).list();
             FinancingFromInvestorsHistory financingFromInvestorsHistory = financingFromInvestorsHistories.get(0);
             FinancingFromInvestorsNotice financingFromInvestorsNotice = financingFromInvestorsNoticeService.lambdaQuery().eq(FinancingFromInvestorsNotice::getFinancingFromInvestorsHistoryId, financingFromInvestorsHistory.getId()).one();
-            smbContractInfos = smbContractInfos.stream().filter(r -> r.getGmtCreate().after(financingFromInvestorsNotice.getEffectiveDate()) && r.getGmtCreate().before(financingFromInvestorsNotice.getExpiringDate())).collect(Collectors.toList());
+            smbContractInfos = smbContractInfos.stream().filter(r -> r.getGmtCreate().before(financingFromInvestorsNotice.getExpiringDate())).collect(Collectors.toList());
             //该供应商存在签署过的苏商银行的合同的话就不需要再次签署
             if(CollectionUtil.isEmpty(smbContractInfos)){
                 smbContractInfos = new ArrayList<>();

src/main/java/com/sunxung/factoring/service/financing/contract/impl/ContractSignConfirmServiceImpl.java

@@ -139,7 +139,7 @@ public class ContractSignConfirmServiceImpl extends ServiceImpl<ContractSignConf
                 List<FinancingFromInvestorsHistory> financingFromInvestorsHistories = financingFromInvestorsHistoryService.lambdaQuery().eq(FinancingFromInvestorsHistory::getSupplierInfoId, supplierInfo.getId()).orderByDesc(FinancingFromInvestorsHistory::getId).list();
                 FinancingFromInvestorsHistory financingFromInvestorsHistory = financingFromInvestorsHistories.get(0);
                 FinancingFromInvestorsNotice financingFromInvestorsNotice = financingFromInvestorsNoticeService.lambdaQuery().eq(FinancingFromInvestorsNotice::getFinancingFromInvestorsHistoryId, financingFromInvestorsHistory.getId()).one();
-                smbContractInfos = smbContractInfos.stream().filter(r -> r.getGmtCreate().after(financingFromInvestorsNotice.getEffectiveDate()) && r.getGmtCreate().before(financingFromInvestorsNotice.getExpiringDate())).collect(Collectors.toList());
+                smbContractInfos = smbContractInfos.stream().filter(r -> r.getGmtCreate().before(financingFromInvestorsNotice.getExpiringDate())).collect(Collectors.toList());
                 Long smbContractInfoId = null;
                 Long smbguaContractContractInfoId = null;
                 if(CollectionUtil.isNotEmpty(smbContractInfos)){