|
|
@@ -1245,7 +1245,7 @@ where super_id is null ) e on e.order_no=a.order_no
|
|
|
and a.order_status not in(5,7)
|
|
|
</if>
|
|
|
<if test="specially == 5">
|
|
|
- and c.department_id in
|
|
|
+ and a.order_dep in
|
|
|
<foreach close=")" collection="deps" item="deps" open="(" separator=",">
|
|
|
#{deps.id}
|
|
|
</foreach>
|
|
|
@@ -1263,7 +1263,7 @@ where super_id is null ) e on e.order_no=a.order_no
|
|
|
and b.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
|
|
|
</if>
|
|
|
<if test="orderNo != null">
|
|
|
- and a.order_no = #{orderNo,jdbcType=VARCHAR}
|
|
|
+ and a.order_no like CONCAT('%',#{orderNo,jdbcType=VARCHAR},'%')
|
|
|
</if>
|
|
|
<if test="contractNo != null">
|
|
|
and a.contract_no like CONCAT('%',#{contractNo,jdbcType=VARCHAR},'%')
|
|
|
@@ -1289,7 +1289,7 @@ where super_id is null ) e on e.order_no=a.order_no
|
|
|
desc
|
|
|
</if>
|
|
|
<if test="page_sql!=null">
|
|
|
- ${page_sql}
|
|
|
+ ${page_sql}
|
|
|
</if>
|
|
|
</select>
|
|
|
|
|
|
@@ -1353,7 +1353,7 @@ where super_id is null ) e on e.order_no=a.order_no
|
|
|
and b.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
|
|
|
</if>
|
|
|
<if test="orderNo != null">
|
|
|
- and a.order_no = #{orderNo,jdbcType=VARCHAR}
|
|
|
+ and a.order_no like CONCAT('%',#{orderNo,jdbcType=VARCHAR},'%')
|
|
|
</if>
|
|
|
<if test="contractNo != null">
|
|
|
and a.contract_no like CONCAT('%',#{contractNo,jdbcType=VARCHAR},'%')
|
|
|
@@ -1392,9 +1392,8 @@ where super_id is null ) e on e.order_no=a.order_no
|
|
|
<if test="adminName != null">
|
|
|
and d.name like CONCAT('%',#{adminName,jdbcType=VARCHAR},'%')
|
|
|
</if>
|
|
|
-
|
|
|
<if test="orderNo != null">
|
|
|
- and a.order_no = #{orderNo,jdbcType=VARCHAR}
|
|
|
+ and a.order_no like CONCAT('%',#{orderNo,jdbcType=VARCHAR},'%')
|
|
|
</if>
|
|
|
<if test="depId != null">
|
|
|
and dep.id= #{depId,jdbcType=VARCHAR}
|