Explorar o código

fix 修复最新签约合同,判断问题

xucaiqin hai 1 mes
pai
achega
3ff68bf535

+ 4 - 0
sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/FileUtils.java

@@ -1,6 +1,7 @@
 package com.sckw.core.utils;
 
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.util.StrUtil;
 import com.aliyun.oss.*;
 import com.aliyun.oss.model.*;
 import com.sckw.core.model.constant.NumberConstant;
@@ -166,6 +167,9 @@ public class FileUtils {
         if (StringUtils.isBlank(replace)) {
             return null;
         }
+        if (StrUtil.startWith(replace, "http")) {
+            return replace;
+        }
         return stringBuilder.append(getOSSAddressPrefix()).append(replace).toString();
     }
 

+ 2 - 2
sckw-modules/sckw-contract/src/main/resources/mapper/KwcContractTradeMapper.xml

@@ -293,8 +293,8 @@
             a.del_flag = 0
               and a.status = 0
               and c.unit_type = 2
-            and a.start_time < #{time}
-            and a.end_time > #{time}
+              and a.start_time < #{time}
+              and (a.end_time > #{time} OR a.end_time IS NULL)
               and c.ent_id = #{entId}
               and b.goods_id = #{goodsId}
             order by a.create_time desc