Просмотр исходного кода

变更咨询师总监与财务总监查看逻辑修改

anderx лет назад: 2
Родитель
Сommit
f2ce3125d2
1 измененных файлов с 16 добавлено и 10 удалено
  1. 16 10
      src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

+ 16 - 10
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -576,12 +576,15 @@ select
 	<if test="salesmanName !=null">
 	<if test="salesmanName !=null">
 	and d.name like concat('%',#{salesmanName},'%')
 	and d.name like concat('%',#{salesmanName},'%')
 	</if>
 	</if>
-	<if test="complete ==0 and processState != 9">
+	<if test="complete ==0 and processState != 9 and  processState != 5 and processState != 7">
 	 and (a.process_state &gt;= #{processState} or a.back_status &gt;= #{processState})
 	 and (a.process_state &gt;= #{processState} or a.back_status &gt;= #{processState})
 	</if>
 	</if>
-	<if test="complete ==0 and processState == 9">
-	 and (a.process_state &gt;= #{processState} and  a.process_state &lt; 10)or a.back_status &gt;= #{processState}
-	</if>
+    <if test="complete ==0 and processState == 9">
+      and (a.process_state &gt;= #{processState} and  a.process_state &lt; 10)or a.back_status &gt;= #{processState}
+    </if>
+    <if test="complete ==0 and (processState == 5 or processState == 7)">
+      and (a.process_state &gt;= 1 and  a.process_state &lt; 10)or a.back_status &gt;= #{processState}
+    </if>
 	<if test="complete ==1 and processState != 6 and processState != 8 and processState != 9">
 	<if test="complete ==1 and processState != 6 and processState != 8 and processState != 9">
 	 and a.process_state = #{processState} and a.status in (0,1,2,3)
 	 and a.process_state = #{processState} and a.status in (0,1,2,3)
 	</if>
 	</if>
@@ -704,12 +707,15 @@ select
 	<if test="salesmanName !=null">
 	<if test="salesmanName !=null">
 	and d.name like concat('%',#{salesmanName},'%')
 	and d.name like concat('%',#{salesmanName},'%')
 	</if>
 	</if>
-	<if test="complete ==0 and processState != 9">
-	 and (a.process_state &gt;= #{processState} or a.back_status &gt;= #{processState})
-	</if>
-	<if test="complete ==0 and processState == 9">
-	 and (a.process_state &gt;= #{processState} and  a.process_state &lt; 10)or a.back_status &gt;= #{processState}
-	</if>
+    <if test="complete ==0 and processState != 9 and  processState != 5 and processState != 7">
+      and (a.process_state &gt;= #{processState} or a.back_status &gt;= #{processState})
+    </if>
+    <if test="complete ==0 and processState == 9">
+      and (a.process_state &gt;= #{processState} and  a.process_state &lt; 10)or a.back_status &gt;= #{processState}
+    </if>
+    <if test="complete ==0 and (processState == 5 or processState == 7)">
+      and (a.process_state &gt;= 1 and  a.process_state &lt; 10)or a.back_status &gt;= #{processState}
+    </if>
 	<if test="complete ==1 and processState != 6 and processState != 8 and processState != 9">
 	<if test="complete ==1 and processState != 6 and processState != 8 and processState != 9">
       and a.process_state = #{processState} and a.status in (0,1,2,3)
       and a.process_state = #{processState} and a.status in (0,1,2,3)
 	</if>
 	</if>