anderx il y a 2 ans
Parent
commit
61dfa2743a

+ 26 - 24
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -28,46 +28,48 @@ public class AFTConstants {
 	public static final String	CED_ASSISTANT						= "99988";
 	/**	集团副总 */
 	public static final String	VICE_CEO							= "99997";
-	/** 技术财税管理员 */
-	public static final String  TECH_FINANCE_DIRECTOR                = "9994";
 	/** 技术管理员 */
 	public static final String  TECH_ADMIN                          = "9998";
-	/**	技术经理 */
-	public static final String  TECH_MANAGER                        = "998";
-	/**	技术员 */
-	public static final String  TECH		                        = "98";
 	/**	财务管理员*/
 	public static final String  FINANCE_ADMIN                       = "9997";
-	/**	湖南特批开票*/
-	public static final String  HN_APPROVED							= "9987";
-	/**	财务经理*/
-	public static final String  FINANCE_MANAGER						= "997";
-	/**	财务专员*/
-	public static final String  FINANCE								= "97";
 	/**	营销管理员 */
 	public static final String  SALESMAN_ADMIN                      = "9996";
 	/**	营销总监 */
 	public static final String  SALESMAN_DIRECTOR                   = "9995";
-	/** 营销经理 */
-	public static final String  SALESMAN_MANAGER                    = "996";
-	/**	营销员 */
-	public static final String  SALESMAN                      		= "96";
-	/** 客服营销员 */
-	public static final String  CUSTOMER_SERVICE_SALESMAN     		= "960";
+	/** 技术财税管理员 */
+	public static final String  TECH_FINANCE_DIRECTOR               = "9994";
+	/** 公司管理 */
+	public static final String  COMPANY_MANAGER 	                = "9993";
+	/** 专利管理员 */
+	public static final String  PATENT_AUDITOR 	                  	= "9992";
 	/**	外包审核员 */
 	public static final String  OUTSOURCE_AUDITOR                   = "9991";
 	/** 人事管理员*/
 	public static final String  PERSONNEL_AUDITOR              	  	= "9990";
-	/** 专利管理员 */
-	public static final String  PATENT_AUDITOR 	                  	= "9992";
-	/** 公司管理 */
-	public static final String  COMPANY_MANAGER 	                = "9993";
 	/** 运营管理 */
 	public static final String  OPERATION_MANAGER		            = "9989";
-	/** 渠道专员 */
-	public static final String  CHANNEL                      		= "80";
+	/** 省内特批 */
+	public static final String  HN_APPROVAL 	             	    = "9988";
+	/**	湖南特批开票*/
+	public static final String  HN_APPROVED							= "9987";
 	/** 渠道总监 */
 	public static final String  CHANNEL_DIRECTOR                    = "9980";
+	/**	技术经理 */
+	public static final String  TECH_MANAGER                        = "998";
+	/**	财务经理*/
+	public static final String  FINANCE_MANAGER						= "997";
+	/** 营销经理 */
+	public static final String  SALESMAN_MANAGER                    = "996";
+	/** 客服营销员 */
+	public static final String  CUSTOMER_SERVICE_SALESMAN     		= "960";
+	/**	技术员 */
+	public static final String  TECH		                        = "98";
+	/**	财务专员*/
+	public static final String  FINANCE								= "97";
+	/**	营销员 */
+	public static final String  SALESMAN                      		= "96";
+	/** 渠道专员 */
+	public static final String  CHANNEL                      		= "80";
 	/** 客服专员 */
 	public static final String  CUSTOMER_SERVICE            		= "81";
 	/** 法务专员 */

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

@@ -2085,21 +2085,20 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   </select>
   <select id="getProcessName" resultType="com.goafanti.order.bo.OrderProcessName">
     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
+           yxgly.name yxgly,d.name cwzy,tp.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
+   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
         where c.role_type ='9996' and a.status ='0' group by a.department_id )yxgly on c.id =yxgly.depId
-     left join (select order_no ,group_concat(aname)name from t_order_examine WHERE type=0 group by order_no ) d on a.order_no=d.order_no
-     left join (select 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
-        where c.role_type in ('99998','99988') and a.status ='0' ) zc on 1=1
-     left join (select 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
+   left join (select order_no ,group_concat(aname)name from t_order_examine WHERE type=0 group by order_no ) d on a.order_no=d.order_no
+   left join (select a.id,a.province ,if(a.province=11,b.name,c.name)name from department a left join (select 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 where c.role_type in ('9988')
+        and a.status ='0' )b  on 1=1 left join (select 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
+        where c.role_type in ('9986') and a.status ='0' )c on 1=1 ) tp on 1=1
+   left join (select 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
         where c.role_type in ('99999','99989') and a.status ='0' ) dsz on 1=1
-     left join (select 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
+   left join (select 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
         where c.role_type in ('9998') and a.status ='0' ) zxsgly on 1=1
     where a.order_no = #{orderNo}
   </select>