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

重报咨询师经理审核BUG修复

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

+ 1 - 1
src/main/java/com/goafanti/common/dao/OrderExamineMapper.java

@@ -104,7 +104,7 @@ public interface OrderExamineMapper {
 
 	int selectByOrderNoAndAid(@Param("orderNo") String orderNo,@Param("aid") String aid);
 
-	void updateByOrderNo(@Param("orderNo") String orderNo,@Param("status")Integer status);
+	void updateByOrderNo(@Param("orderNo") String orderNo,@Param("status")Integer status,@Param("type")Integer type);
 
 	void updateDimissionTransfer(@Param("aid")String aid, @Param("transferId")String transferId, @Param("type")Integer type);
 

+ 3 - 0
src/main/java/com/goafanti/common/mapper/OrderExamineMapper.xml

@@ -329,6 +329,9 @@
     <if test="status != null">
     and status=#{status}
     </if>
+    <if test="type !=null">
+      and type =#{type}
+    </if>
   </update>
    <update id="updateDimissionTransfer">
   update order_examine set aid= #{transferId}

+ 4 - 2
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -361,9 +361,11 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			if (processState>nb.getBackStatus()) {
 				nb.setBackStatus(processState);
 			}
-			//驳回位置查看有无审核人,没有则直接跳下一个
+			//驳回重置审核人
 			if (rejectState<=3) {
-				orderExamineMapper.updateByOrderNo(orderNo,1);
+				orderExamineMapper.updateByOrderNo(orderNo,1,null);
+			}else if (rejectState==4){
+				orderExamineMapper.updateByOrderNo(orderNo,1,1);
 			}
 			if (rejectState==3) {
 				zxsFlag=pushZXSprocess(nb);