授信解冻增加条件

sc-service/src/main/java/com/huyi/service/creditLine/controller/CreditLineController.java

@@ -696,6 +696,8 @@ public class CreditLineController extends BaseController {
         ZcFinanceProComRel proComRel = iZcFinanceProComRelService.getById(zfpcrId);
         //到期时间
         String zfpcrEndDate = proComRel.getZfpcrEndDate();
+        //开始日期
+        String zfpcrStartDate = proComRel.getZfpcrStartDate();
 
         ZcFinanceProComRel zcFinanceProComRel = new ZcFinanceProComRel();
         //授信id
@@ -709,14 +711,19 @@ public class CreditLineController extends BaseController {
                 return AjaxResult.error("此授信正在使用无法冻结");
             }
         }else {
-            if (CommonUtil.isNotEmpty(zfpcrEndDate)){
+            if (CommonUtil.isNotEmpty(zfpcrEndDate) && CommonUtil.isNotEmpty(zfpcrStartDate)){
                 Date EndDate = DateUtils.parseDate(zfpcrEndDate,"yyyy-MM-dd");
                 zfpcrEndDate = DateUtils.parseDateToStr("yyyyMMdd",EndDate);
                 //当前时间
                 String currentDate = DateUtils.dateTimeNow("yyyyMMdd");
                 int result = CommonUtil.compare(zfpcrEndDate,currentDate);
-                if (result <= 0){
-                    return AjaxResult.error("此授信已到期,请修改到期时间后解冻");
+                Date beginDate = DateUtils.parseDate(zfpcrStartDate,"yyyy-MM-dd");
+                zfpcrStartDate = DateUtils.parseDateToStr("yyyyMMdd",beginDate);
+                //当前日期和开始日期比较
+                int  ending =  CommonUtil.compare(zfpcrStartDate,currentDate);
+                //小于开始日期或者大于结束日期
+                if (ending == -1  || result == 1 ){
+                    return AjaxResult.error("请先修改授信的有效期范围,只有在有效期范围内才可以解冻");
                 }
             }
             zcFinanceProComRel.setZfpcrStatus("00");