|
@@ -35,7 +35,7 @@
|
|
|
w.contract_no as contractNo,
|
|
w.contract_no as contractNo,
|
|
|
w.car_no as carNo,
|
|
w.car_no as carNo,
|
|
|
w.agent,
|
|
w.agent,
|
|
|
- w.back_office as backOffice
|
|
|
|
|
|
|
+ w.back_office as backOffice,
|
|
|
w.create_date as createDate,
|
|
w.create_date as createDate,
|
|
|
d.water_content as waterContent,
|
|
d.water_content as waterContent,
|
|
|
d.bulk_density as bulkDensity,
|
|
d.bulk_density as bulkDensity,
|
|
@@ -52,10 +52,10 @@
|
|
|
and w.position_id = #{positionId}
|
|
and w.position_id = #{positionId}
|
|
|
and w.delete_flag = '0'
|
|
and w.delete_flag = '0'
|
|
|
<if test="searchType != null and searchType != ''">
|
|
<if test="searchType != null and searchType != ''">
|
|
|
- <if test="searchType == 2">
|
|
|
|
|
|
|
+ <if test="searchType == 1">
|
|
|
AND w.in_out_flag = '1'
|
|
AND w.in_out_flag = '1'
|
|
|
</if>
|
|
</if>
|
|
|
- <if test="searchType == 3">
|
|
|
|
|
|
|
+ <if test="searchType == 2">
|
|
|
AND w.in_out_flag = '2'
|
|
AND w.in_out_flag = '2'
|
|
|
</if>
|
|
</if>
|
|
|
</if>
|
|
</if>
|
zhangyuewww