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

变更审核咨询师逻辑处理

anderx лет назад: 3
Родитель
Сommit
ec9304c154

+ 5 - 5
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1038,7 +1038,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
         </if>
         </if>
       </if>
       </if>
   	<if test="specially == 4">
   	<if test="specially == 4">
-  	and a.process_status in (4,5,6,99)
+  	and a.process_status in (5,6,7,99)
   	and a.order_status  in(1,2,3,4,6)
   	and a.order_status  in(1,2,3,4,6)
   	</if>
   	</if>
     <if test="deps!=null">
     <if test="deps!=null">
@@ -1204,7 +1204,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
        </if>
        </if>
      </if>
      </if>
   	<if test="specially == 4">
   	<if test="specially == 4">
-  	and a.process_status in (4,5,6,99)
+  	and a.process_status in (5,6,7,99)
   	and a.order_status  in(1,2,3,4,6)
   	and a.order_status  in(1,2,3,4,6)
   	</if>
   	</if>
      <if test="deps!=null">
      <if test="deps!=null">
@@ -1214,13 +1214,13 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
        </foreach>
        </foreach>
      </if>
      </if>
   	<if test="distribution == 0">
   	<if test="distribution == 0">
-  	and a.process_status &lt; 5
+  	and a.process_status &lt; 6
   	</if>
   	</if>
   	<if test="distribution == 1">
   	<if test="distribution == 1">
-  	and a.process_status = 5
+  	and a.process_status = 6
   	</if>
   	</if>
   	<if test="distribution == 2">
   	<if test="distribution == 2">
-  	and a.process_status = 6
+  	and a.process_status = 7
   	</if>
   	</if>
   	<if test="name != null">
   	<if test="name != null">
   	and b.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	and b.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')

+ 21 - 1
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -285,7 +285,27 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 							} else {
 							} else {
 								orderExamineMapper.updateByOrderNo(orderNo, null);
 								orderExamineMapper.updateByOrderNo(orderNo, null);
 							}
 							}
-							nb.setProcessState(OrderChangeProcess.JSY.getCode());
+							int zxs=orderExamineMapper.checkCountStatus(orderNo,0,null);
+							int zxsjl=orderExamineMapper.checkCountStatus(orderNo,1,null);
+							if (zxs>0){
+								nb.setProcessState(OrderChangeProcess.JSY.getCode());
+							}else {
+								if (nb.getType()==OrderChangeType.CB.getCode()){
+									nb.setProcessState(OrderChangeProcess.CWZY.getCode());
+								}else if (nb.getType()==OrderChangeType.JXMBG.getCode()){
+									nb.setProcessState(OrderChangeProcess.JSZJ.getCode());
+								}else if (nb.getType()==OrderChangeType.XMJJEBG.getCode()||
+										nb.getType()==OrderChangeType.TDTK.getCode()||
+										nb.getType()==OrderChangeType.TDBTK.getCode()){
+									if (zxsjl>0){
+										nb.setProcessState(OrderChangeProcess.JSJL.getCode());
+									}else {
+										nb.setProcessState(OrderChangeProcess.JSZJ.getCode());
+									}
+								}
+							}
+
+
 						}else if (nb.getType()==OrderChangeType.JJEBG.getCode()){
 						}else if (nb.getType()==OrderChangeType.JJEBG.getCode()){
 							nb.setProcessState(OrderChangeProcess.JSZJ.getCode());
 							nb.setProcessState(OrderChangeProcess.JSZJ.getCode());
 						}else if (nb.getType()==OrderChangeType.JJEBG.getCode()){
 						}else if (nb.getType()==OrderChangeType.JJEBG.getCode()){