Просмотр исходного кода

拆分特批审核、董事长特批审核与公司/部门特批审核

anderx 1 год назад
Родитель
Сommit
502cfa99ea

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

@@ -1032,10 +1032,10 @@ 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 == 3">
+      and  a.order_status=2
   	<if test="manageType ==0">
       and dep.approval_aid= #{aid,jdbcType=VARCHAR}
     </if>
-      and  a.order_status=2
       <if test="approval ==0">
         and a.process_status in(4)
         and a.approval = 0

+ 7 - 0
src/main/java/com/goafanti/order/bo/InputOrderNewListBo.java

@@ -7,6 +7,9 @@ public class InputOrderNewListBo {
     private String orderNo;
     private String starTime;
     private String endTime;
+    /**
+     * 0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询 6客服查询 7统计签单订单 8客户订单列表 9 复审订单 10 营销经理 11董事长特批
+     */
     private Integer specially;
     private Integer approval;
     /**
@@ -17,6 +20,10 @@ public class InputOrderNewListBo {
     private String contractNo;
     private Integer outsource;
     private Integer liquidationStatus;
+
+    /**
+     *  金额筛选 0=10万元以下, 1=10万~20万,2=20万~30万,3=30万~40万,4=40万以上
+     */
     private Integer amountStatus;
     private String contractStart;
     private String contractEnd;

+ 1 - 2
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -327,8 +327,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 
 	/**
 	 * 		订单列表
-	 *  specially 0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询 6客服查询 7统计签单订单 8客户订单列表 9 复审订单 10 营销经理
-	 *  distribution (咨询师管理列表 0 未分配 1部分 2全部
+
 	 *  amountStatus  0 10万元以下 1 10万~20万 2 20万~30万 3 30万~40万  4 40万以上
 	 * @return
 	 */

+ 5 - 7
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -943,14 +943,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			if (StringUtils.isNotBlank(in.getAid())) {
 				params.put("aid", in.getAid());
 			}
-		}
-		if (in.getSpecially()==3){
+		}else if (in.getSpecially()==3){
 			params.put("aid", TokenManager.getAdminId());
-			if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
-				params.put("manageType",1);
-			}else  {
-				params.put("manageType",0);
-			}
+			params.put("manageType",0);
+		}else if (in.getSpecially()==11){
+			params.put("aid", TokenManager.getAdminId());
+			params.put("manageType",1);
 		}
 		params.put("specially", in.getSpecially());
 		if (StringUtils.isNotBlank(in.getName())) {