Browse Source

订单新增高新纯咨询信息

anderx 3 years ago
parent
commit
4413172f41

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

@@ -921,11 +921,11 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   </select>
   <!-- 通过订单编号获得订单的负责人(营销员) -->
   <select id="getSaleIdByOno" parameterType="java.lang.String" resultType="com.goafanti.order.bo.TOrderNewBo">
-    select o.order_no orderNo ,o.salesman_id as salesmanId, a.name as salesmanName,
+    select o.order_no orderNo ,o.salesman_id as salesmanId, a.name as salesmanName,e.name managerName,
            o.contract_no contractNo,a.email ,u.nickname as userName,o.order_dep orderDep,d.name departmentName,
            d.finance_id  financeId
     from t_order_new o left join admin a on o.salesman_id = a.id left join `user` u on u.id = o.buyer_id
-    left join department d on o.order_dep=d.id
+    left join department d on o.order_dep=d.id left join admin e on a.manager_id=e.id
     where order_no = #{_parameter,jdbcType=VARCHAR}
   </select>
 

+ 8 - 0
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -17,6 +17,7 @@ public class TOrderNewBo extends TOrderNew{
 	private String userName;
 	private String nickname;
 	private String salesmanName;
+	private String managerName;
 	private String financeName;
 	private String consultantName;
 	private String dunSubject;
@@ -87,6 +88,13 @@ public class TOrderNewBo extends TOrderNew{
 	 */
 	private String addDeductionOther;
 
+	public String getManagerName() {
+		return managerName;
+	}
+
+	public void setManagerName(String managerName) {
+		this.managerName = managerName;
+	}
 
 	public Integer getKnowledgeServices() {
 		return knowledgeServices;

+ 14 - 17
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -214,28 +214,20 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@Override
 	public List<NewOrderChangeBo> orderChangeDetails(String orderNo) {
 		List<NewOrderChangeBo> list=newOrderChangeMapper.selectByorderNo(orderNo);
-		for (NewOrderChangeBo noc : list) {
-//			List<OrderExamineBo> consultantExamine =orderExamineMapper.selectByOrderNo(noc.getOrderNo(),0);
-//			List<OrderExamineBo> managerExamine=orderExamineMapper.selectByOrderNo(noc.getOrderNo(),1);
-			int isExamine=orderExamineMapper.selectByOrderNoAndAid(noc.getOrderNo(),TokenManager.getAdminId());
-//			noc.setConsultantExamine(consultantExamine);
-//			noc.setManagerExamine(managerExamine);
-			if (noc.getVoucherUrl()!=null) {
-				TOrderNew t=tOrderNewMapper.selectByPrimaryKey(noc.getOrderNo());
-				noc.setVoucherUrl(pushOrderService.changeProcessStatusConstant(noc.getVoucherUrl(),t.getSalesmanId(),noc.getProcessState(),noc.getStatus()));
-			}
-			noc.setIsExamine(isExamine);
-		}
+//		for (NewOrderChangeBo noc : list) {
+//			int isExamine=orderExamineMapper.selectByOrderNoAndAid(noc.getOrderNo(),TokenManager.getAdminId());
+//			if (noc.getVoucherUrl()!=null) {
+//				TOrderNew t=tOrderNewMapper.selectByPrimaryKey(noc.getOrderNo());
+//				noc.setVoucherUrl(pushOrderService.changeProcessStatusConstant(noc.getVoucherUrl(),t.getSalesmanId(),noc.getProcessState(),noc.getStatus()));
+//			}
+//			noc.setIsExamine(isExamine);
+//		}
 		return list;
 	}
 	@Override
 	public NewOrderChangeBo orderChangeDetailsById(Integer id) {
 		NewOrderChangeBo nb=newOrderChangeMapper.selectById(id);
-//		List<OrderExamineBo> consultantExamine =orderExamineMapper.selectByOrderNo(nb.getOrderNo(),0);
-//		List<OrderExamineBo> managerExamine=orderExamineMapper.selectByOrderNo(nb.getOrderNo(),1);
 		int isExamine=orderExamineMapper.selectByOrderNoAndAid(nb.getOrderNo(),TokenManager.getAdminId());
-//		nb.setConsultantExamine(consultantExamine);
-//		nb.setManagerExamine(managerExamine);
 		nb.setIsExamine(isExamine);
 		if(nb.getProcessState()!=null){
 			TOrderNew t=tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
@@ -633,7 +625,12 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			noc.setChangeAmount(t.getChangeAmount());
 			noc.setApplicant(t.getApplicant());
 			noc.setStatus(1);//订单置为正常
-			noc.setProcessState(OrderChangeProcess.YXJL.getCode());
+			TOrderNewBo tOrderNew = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
+			if (tOrderNew.getManagerName()!=null){
+				noc.setProcessState(OrderChangeProcess.YXJL.getCode());
+			}else {
+				noc.setProcessState(OrderChangeProcess.YXGLY.getCode());
+			}
 			noc.setDepName(t.getDepName());
 			OrderChangeLog ocl=new OrderChangeLog();
 			ocl.setAuditor(TokenManager.getAdminId());