Browse Source

营销经理审核开发

anderx 3 years ago
parent
commit
961c6a4430

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

@@ -987,11 +987,11 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	and a.salesman_id = #{aid,jdbcType=VARCHAR}
   	</if>
     <if test="specially == 10">
-      and a.process_status = 1  and a.order_status = 1
+      and a.process_status = 1  and a.order_status in (0,1,2)
   	  and mg.manager_id= #{aid}
     </if>
     <if test="specially == 1">
-      and a.process_status = 2  and a.order_status = 1
+      and a.process_status = 2  and a.order_status in (0,1,2)
     </if>
   	<if test="specially == 2">
   	and a.order_status in(3,5)
@@ -1153,11 +1153,11 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
       and a.salesman_id = #{aid,jdbcType=VARCHAR}
     </if>
      <if test="specially == 10">
-       and a.process_status = 1  and a.order_status = 1
+       and a.process_status = 1  and a.order_status in (0,1,2)
        and mg.manager_id= #{aid}
      </if>
   	<if test="specially == 1">
-  	and a.process_status = 2  and a.order_status = 1
+  	and a.process_status = 2  and a.order_status in (0,1,2)
   	</if>
   	<if test="specially == 2">
   	and a.order_status in(3,5)
@@ -1981,9 +1981,10 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
     from t_order_new where delete_sign in (0,2)
   </select>
   <select id="getProcessName" resultType="com.goafanti.order.bo.OrderProcessName">
-    select a.order_no orderNo,a.approval ,b.name yxy ,yxgly.name yxgly,d.name cwzy,zc.name zc,
-           zxsgly.name zxsgly,dsz.name dsz
+    select a.order_no orderNo,a.approval,a.process_status processStatus  ,b.name yxy,mg.name yxjl,
+        yxgly.name yxgly,d.name cwzy,zc.name zc, zxsgly.name zxsgly,dsz.name dsz
     from t_order_new a left join admin b on a.salesman_id =b.id
+    left join admin mg on b.manager_id =mg.id
      left join department c on a.order_dep =c.id
      left join (select a.department_id depId,group_concat(a.name) name
         from admin a left join user_role b on a.id=b.uid left join `role` c on b.rid =c.id

+ 18 - 0
src/main/java/com/goafanti/order/bo/OrderProcessName.java

@@ -4,13 +4,31 @@ public class OrderProcessName {
 
     private String orderNo;
     private Integer approval;
+    private Integer processStatus;
     private String yxy;
+    private String yxjl;
     private String yxgly;
     private String cwzy;
     private String zc;
     private String zxsgly;
     private String dsz;
 
+    public String getYxjl() {
+        return yxjl;
+    }
+
+    public void setYxjl(String yxjl) {
+        this.yxjl = yxjl;
+    }
+
+    public Integer getProcessStatus() {
+        return processStatus;
+    }
+
+    public void setProcessStatus(Integer processStatus) {
+        this.processStatus = processStatus;
+    }
+
     public String getOrderNo() {
         return orderNo;
     }

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

@@ -760,7 +760,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (TokenManager.hasRole(AFTConstants.TECH_ADMIN))in.setSpecially(4);
 		else if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN))in.setSpecially(1);
 		else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER))in.setSpecially(10);
-		else if (TokenManager.hasRole(AFTConstants.SALESMAN))in.setSpecially(0);
 		if (in.getSpecially()!=null&&(in.getSpecially()==0|| in.getSpecially()==1|| in.getSpecially()==2||
 				in.getSpecially()==4|| in.getSpecially()==5|| in.getSpecially()==7|| in.getSpecially()==10)) {
 			//0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询
@@ -957,7 +956,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			type=NoticeStatus.ORDER_YES.getCode();
 			//增加日志
 			addOrderLog(tl,reason);
-
 		}else if (orderStatus.equals(OrderNewState.QDSHJJ.getCode())) {//如果不通过新增驳回
 				if (outsource==0) {//非外包
 				t.setProcessStatus(ProcessStatus.YPYXY.getCode());

+ 5 - 4
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -171,6 +171,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		aids.add(taskReceiverId);
 		TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
 		orderNewService.pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_TASK_TO.getCode(),order, TokenManager.getAdminId(),0,taskId);
+		//处理订单信息
 		checkProjiectAllocation(t.getOrderNo());
 		pushTaskChange(TokenManager.getAdminId(),taskReceiverId,type,t.getOrderNo());
 		return 1;
@@ -316,7 +317,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 	@Override
 	public Integer getOrderProcessStatus(String  orderNo) {
-		Integer processStatus=4;
+		Integer processStatus=ProcessStatus.YPZXSGLY.getCode();
 		List<TOrderTaskBo> taskBos=tOrderTaskMapper.selectOrderTaskAll(orderNo,4);
 		int i=0;
 		for (TOrderTaskBo to : taskBos) {
@@ -325,11 +326,11 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			}
 		}
 		if (i==taskBos.size()) {
-			processStatus=6;
+			processStatus=ProcessStatus.YQBFPZXSGLY.getCode();
 		}else if(i>0&&i<taskBos.size()){
-			processStatus=5;
+			processStatus=ProcessStatus.YBFPZXSGLY.getCode();;
 		}else if(i==0){
-			processStatus=4;
+			processStatus=ProcessStatus.YPZXSGLY.getCode();
 		}
 		return processStatus;
 	}