Browse Source

修改订单搜索客户接口

anderx 1 year ago
parent
commit
a5001dfc65

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

@@ -1098,7 +1098,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
       </if>
     </if>
     <if test="specially == 4">
-      and a.process_status in (3,6,7,8,99)
+      and a.process_status in (3,5,6,7,99)
       and a.order_status  in(1,2,3,4,6)
     </if>
     <if test="deps!=null">

+ 5 - 5
src/main/java/com/goafanti/order/enums/ProcessStatus.java

@@ -20,15 +20,15 @@ public enum ProcessStatus {
 	/**
 	 * 指定审核
 	 */
-	CWZDSH(4,"财务指定审核人"),
+//	CWZDSH(4,"财务指定审核人"),
 	/** 已派特批审核 **/
-	YPTPSH(5,"已派特批审核"),
+	YPTPSH(4,"已派特批审核"),
 	/** 已派咨询师管理员 **/
-	YPZXSGLY(6,"已派咨询师管理员"),
+	YPZXSGLY(5,"已派咨询师管理员"),
 	/** 已部分派咨询师经理 **/
-	YBFPZXSGLY(7,"已部分分派咨询师经理"),
+	YBFPZXSGLY(6,"已部分分派咨询师经理"),
 	/** 已全部分派咨询师经理 **/
-	YQBFPZXSGLY(8,"已全部分派咨询师经理"),
+	YQBFPZXSGLY(7,"已全部分派咨询师经理"),
 
 
 	/** 无效 **/

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

@@ -512,17 +512,17 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		//如果全部派单完成才需要通知和走下个流程
 		if (flag){
 			//如果设置了特定审核需要步入特定审核
-			if (aid!=null){
-				t.setProcessStatus(ProcessStatus.CWZDSH.getCode());
-				List<String> aids = new ArrayList<>();
-				aids.add(aid);
-				TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
-				order.setProcessStatus(ProcessStatus.CWZDSH.getCode());
-				pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_YES.getCode(),order, TokenManager.getAdminId(), use.getApproval());
-			}else {
+//			if (aid!=null){
+//				t.setProcessStatus(ProcessStatus.CWZDSH.getCode());
+//				List<String> aids = new ArrayList<>();
+//				aids.add(aid);
+//				TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
+//				order.setProcessStatus(ProcessStatus.CWZDSH.getCode());
+//				pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_YES.getCode(),order, TokenManager.getAdminId(), use.getApproval());
+//			}else {
 				pushNoticeAndEmail(t, use);
 
-			}
+//			}
 		}else {
 			List<TOrderExamine> tOrderExamines = tOrderExamineMapper.selectByOrderNo(orderNo,0);
 			StringBuffer str=new StringBuffer();