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

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

@@ -315,7 +315,7 @@
   </select>
 
   <select id="selectByOrderNo" resultType="com.goafanti.common.bo.OrderExamineBo">
-    		select a.id,b.name,a.type,a.status
+    		select a.id,a.aid,b.name,a.type,a.status
     from order_examine a left join admin b on a.aid=b.id
     where a.order_no= #{orderNo} and a.type= #{type}
   </select>

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

@@ -464,10 +464,11 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			alist.addAll(adminMapper.listNameByDepAndName(o.getOrderDep(), AFTConstants.SALESMAN_ADMIN));
 			break;
 		case 3:
-			alist.addAll(tOrderTaskMapper.listNameByDepAndName(o.getOrderNo(),0));
+
+			alist.addAll(addOrderExamine(o.getOrderNo(),0));
 			break;
 		case 4:
-			alist.addAll(tOrderTaskMapper.listNameByDepAndName(o.getOrderNo(),1));
+			alist.addAll(addOrderExamine(o.getOrderNo(),1));
 			break;
 		case 5:
 			for (Admin admin : adminMapper.getAdminRoleTypeList(AFTConstants.TECH_ADMIN)) {
@@ -506,6 +507,23 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	}
 
 	/**
+	 *
+	 * @param orderNo 订单编号
+	 * @param i	 0咨询师 1咨询师经理
+	 * @return
+	 */
+	private List<String> addOrderExamine(String orderNo, Integer i) {
+		List<String> list=new ArrayList<>();
+		List<OrderExamineBo> orderExamineBos = orderExamineMapper.selectByOrderNo(orderNo, i);
+		for (OrderExamineBo bo : orderExamineBos) {
+			if (bo.getStatus()==0){
+				list.add(bo.getAid());
+			}
+		}
+		return list;
+	}
+
+	/**
 	 * 变更完成复制出原订单镜像
 	 */
 	private void changeAdopt(NewOrderChangeBo nb) {