Browse Source

财务筛选列表已分配未分配条件修改,财务驳回、咨询师管理员驳回去除原有财务专员

anderx 6 years ago
parent
commit
e90a1a2baa

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

@@ -895,10 +895,10 @@
   	and approval in (0,2) and outsource=#{o.outsource,jdbcType=INTEGER}
   	and process_status >= 2
   	<if test="o.processStatus == 2">
-  	and o.finance_id is null
+  	and o.finance_id in(null,'') 
   	</if>
   	<if test="o.processStatus == 3">
-  	and o.finance_id is not null
+  	and o.finance_id is not null  
   	</if>
   	<if test="o.orderNo != null and o.orderNo != &quot;&quot;">
   	and o.order_no = #{o.orderNo,jdbcType=VARCHAR}

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -168,6 +168,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		TOrderNew orderNew = new  TOrderNew();
 		orderNew.setOrderNo(back.getOrderNo());
 		orderNew.setOrderStatus(OrderNewState.YBH.getCode());
+		orderNew.setFinanceId("");
 		int c = tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
 		
 		//新增驳回数据

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -721,6 +721,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			return -1;
 		}
 		t.setOrderStatus(OrderNewState.YBH.getCode());
+		t.setFinanceId("");
 		addBackOrder(orderNo, reason);
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 	}