|
|
@@ -447,11 +447,11 @@
|
|
|
</if>
|
|
|
where 1=1
|
|
|
<if test="processStatus ==2">
|
|
|
- and a.process_status>0
|
|
|
- <if test="examineStatus ==0">
|
|
|
+ and a.process_status>=0
|
|
|
+ <if test="examineStatus ==1">
|
|
|
and a.status=1
|
|
|
</if>
|
|
|
- <if test="examineStatus ==1">
|
|
|
+ <if test="examineStatus ==2">
|
|
|
and a.status=2
|
|
|
</if>
|
|
|
</if>
|
|
|
@@ -473,8 +473,8 @@
|
|
|
<if test="type != null">
|
|
|
and a.type= #{type}
|
|
|
</if>
|
|
|
- <if test="checkNo != null">
|
|
|
- and a.check_no like concat('%',#{checkNo},'%')
|
|
|
+ <if test="checkNo != null or username != null" >
|
|
|
+ and (a.check_no like concat('%',#{checkNo},'%') or tm.buyer_name like concat('%',#{username},'%'))
|
|
|
</if>
|
|
|
<if test="startTime !=null and endTime !=null">
|
|
|
and a.create_time between #{startTime} and #{endTime}
|
|
|
@@ -485,9 +485,7 @@
|
|
|
<if test="contractNo != null">
|
|
|
and e.contract_no = #{contractNo}
|
|
|
</if>
|
|
|
- <if test="username != null">
|
|
|
- and tm.buyer_name like concat('%',#{username},'%')
|
|
|
- </if>
|
|
|
+
|
|
|
<if test="applyDep != null">
|
|
|
and a.apply_dep = #{applyDep}
|
|
|
</if>
|
|
|
@@ -518,11 +516,11 @@
|
|
|
</if>
|
|
|
where 1=1
|
|
|
<if test="processStatus ==2">
|
|
|
- and a.process_status>0
|
|
|
- <if test="examineStatus ==0">
|
|
|
+ and a.process_status>=0
|
|
|
+ <if test="examineStatus ==1">
|
|
|
and a.status=1
|
|
|
</if>
|
|
|
- <if test="examineStatus ==1">
|
|
|
+ <if test="examineStatus ==2">
|
|
|
and a.status=2
|
|
|
</if>
|
|
|
</if>
|
|
|
@@ -544,8 +542,8 @@
|
|
|
<if test="type != null">
|
|
|
and a.type= #{type}
|
|
|
</if>
|
|
|
- <if test="checkNo != null">
|
|
|
- and a.check_no like concat('%',#{checkNo},'%')
|
|
|
+ <if test="checkNo != null or username != null" >
|
|
|
+ and (a.check_no like concat('%',#{checkNo},'%') or tm.buyer_name like concat('%',#{username},'%'))
|
|
|
</if>
|
|
|
<if test="startTime !=null and endTime !=null">
|
|
|
and a.create_time between #{startTime} and #{endTime}
|
|
|
@@ -556,9 +554,6 @@
|
|
|
<if test="contractNo != null">
|
|
|
and e.contract_no = #{contractNo}
|
|
|
</if>
|
|
|
- <if test="username != null">
|
|
|
- and tm.buyer_name like concat('%',#{username},'%')
|
|
|
- </if>
|
|
|
<if test="applyDep != null">
|
|
|
and a.apply_dep = #{applyDep}
|
|
|
</if>
|
|
|
@@ -584,11 +579,11 @@
|
|
|
</if>
|
|
|
where 1=1
|
|
|
<if test="processStatus ==2">
|
|
|
- and a.process_status>0
|
|
|
- <if test="examineStatus ==0">
|
|
|
+ and a.process_status>=0
|
|
|
+ <if test="examineStatus ==1">
|
|
|
and a.status=1
|
|
|
</if>
|
|
|
- <if test="examineStatus ==1">
|
|
|
+ <if test="examineStatus ==2">
|
|
|
and a.status=2
|
|
|
</if>
|
|
|
</if>
|
|
|
@@ -610,9 +605,6 @@
|
|
|
<if test="type != null">
|
|
|
and a.type= #{type}
|
|
|
</if>
|
|
|
- <if test="checkNo != null">
|
|
|
- and a.check_no like concat('%',#{checkNo},'%')
|
|
|
- </if>
|
|
|
<if test="startTime !=null and endTime !=null">
|
|
|
and a.create_time between #{startTime} and #{endTime}
|
|
|
</if>
|
|
|
@@ -622,9 +614,6 @@
|
|
|
<if test="contractNo != null">
|
|
|
and e.contract_no = #{contractNo}
|
|
|
</if>
|
|
|
- <if test="username != null">
|
|
|
- and tm.buyer_name like concat('%',#{username},'%')
|
|
|
- </if>
|
|
|
<if test="applyDep != null">
|
|
|
and a.apply_dep = #{applyDep}
|
|
|
</if>
|