|
|
@@ -274,8 +274,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
ON zfp_id = zfi_product_id
|
|
|
WHERE zfi_status = '02'
|
|
|
AND (
|
|
|
- DATE_SUB(zfi_expire_date, INTERVAL zfp_shortest_period DAY) >= now()
|
|
|
- AND DATE_SUB(zfi_expire_date, INTERVAL zfp_shortest_period DAY) <= DATE_SUB(now(), INTERVAL -30 DAY)
|
|
|
+ DATE_SUB(zfi_expire_date, INTERVAL zfp_shortest_period DAY) >= DATE(now())
|
|
|
+ AND DATE_SUB(zfi_expire_date, INTERVAL zfp_shortest_period DAY) < DATE_SUB(now(), INTERVAL -30 DAY)
|
|
|
)
|
|
|
<if test="coreCompanyId != null and coreCompanyId != ''">
|
|
|
AND zfi_core_id = #{coreCompanyId}
|
|
|
@@ -575,7 +575,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
WHERE
|
|
|
zfi_status='02'
|
|
|
AND (
|
|
|
- DATE_SUB(zfi_expire_date, INTERVAL zfp_shortest_period DAY) >= now()
|
|
|
+ DATE_SUB(zfi_expire_date, INTERVAL zfp_shortest_period DAY) >= DATE(now())
|
|
|
AND DATE_SUB(zfi_expire_date, INTERVAL zfp_shortest_period DAY) <= DATE_SUB(now(), INTERVAL -30 DAY)
|
|
|
)
|
|
|
<if test="paramMap.supplierCompanyId != null and paramMap.supplierCompanyId != ''">
|