|
@@ -359,14 +359,6 @@
|
|
|
AND company_type = '1'
|
|
|
</when>
|
|
|
</choose>
|
|
|
- <choose>
|
|
|
- <when test="machineType != null and machineType !='' and machineType.equals("0")">
|
|
|
- AND (machine_type IS NULL OR machine_type = '0')
|
|
|
- </when>
|
|
|
- <when test="machineType != null and machineType !='' and machineType.equals("1")">
|
|
|
- AND machine_type = '1'
|
|
|
- </when>
|
|
|
- </choose>
|
|
|
and status = 1
|
|
|
and create_date >= STR_TO_DATE(CONCAT(#{begin},' 00:00:00'),'%Y-%m-%d %H:%i:%s')
|
|
|
<![CDATA[ and create_date <= STR_TO_DATE(CONCAT(#{end},' 23:59:59'),'%Y-%m-%d %H:%i:%s') ]]>
|