|
|
|
@@ -212,12 +212,12 @@ |
|
|
|
and wcubi.`create_date` between #{basicInfo.startTime} and #{basicInfo.endTime} |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test=" null != scanStartTime and null!=scanEndTime"> |
|
|
|
and wcubi.`tag_scan_time` between #{scanStartTime} and #{scanEndTime} |
|
|
|
<if test=" null != basicInfo.scanStartTime and null!=basicInfo.scanEndTime"> |
|
|
|
and wcubi.`tag_scan_time` between #{basicInfo.scanStartTime} and #{basicInfo.scanEndTime} |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test=" null != activeStartTime and null!=activeEndTime"> |
|
|
|
and wcubi.`active_time` between #{activeStartTime} and #{activeEndTime} |
|
|
|
<if test=" null != basicInfo.activeStartTime and null!=basicInfo.activeEndTime"> |
|
|
|
and wcubi.`active_time` between #{basicInfo.activeStartTime} and #{basicInfo.activeEndTime} |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test=" null != basicInfo.status "> |
|
|
|
@@ -772,12 +772,12 @@ |
|
|
|
and cu.`create_date` between #{basicInfo.startTime} and #{basicInfo.endTime} |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test=" null != scanStartTime and null!=scanEndTime"> |
|
|
|
and wcubi.`tag_scan_time` between #{scanStartTime} and #{scanEndTime} |
|
|
|
<if test=" null != basicInfo.scanStartTime and null!=basicInfo.scanEndTime"> |
|
|
|
and wcubi.`tag_scan_time` between #{basicInfo.scanStartTime} and #{basicInfo.scanEndTime} |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test=" null != activeStartTime and null!=activeEndTime"> |
|
|
|
and wcubi.`active_time` between #{activeStartTime} and #{activeEndTime} |
|
|
|
<if test=" null != basicInfo.activeStartTime and null!=basicInfo.activeEndTime"> |
|
|
|
and wcubi.`active_time` between #{basicInfo.activeStartTime} and #{basicInfo.activeEndTime} |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test=" null != basicInfo.ids "> |
|
|
|
|