Browse Source

咨询师与经理修改处理

anderx 3 years ago
parent
commit
26c9a0c7a4

+ 19 - 2
src/main/java/com/goafanti/admin/service/impl/NewAdminServiceImpl.java

@@ -146,6 +146,14 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 					flag=4;
 					roleType=AFTConstants.TECH_ADMIN;
 					break;
+				}else if (AFTConstants.TECH.equals(s)){
+					flag=5;
+					roleType=AFTConstants.TECH;
+					break;
+				}else if (AFTConstants.TECH_MANAGER.equals(s)){
+					flag=6;
+					roleType=AFTConstants.TECH_MANAGER;
+					break;
 				}
 			}
 		}
@@ -168,14 +176,23 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 					flag=4;
 					roleType=AFTConstants.TECH_ADMIN;
 					break;
+				}else if (AFTConstants.TECH.equals(role.getRoleType().toString())){
+					flag=5;
+					roleType=AFTConstants.TECH;
+					break;
+				}else if (AFTConstants.TECH_MANAGER.equals(role.getRoleType().toString())){
+					flag=6;
+					roleType=AFTConstants.TECH_MANAGER;
+					break;
 				}
 			}
 		}
 		if (flag!=0){
-			Admin admin = adminMapper.selectByPrimaryKey(id);
-			asyncUtils.updateListExamineName(flag,admin.getDepartmentId(),roleType);
+
+			asyncUtils.updateListExamineName(flag,id,roleType);
 		}
 
+
 	}
 
 

+ 4 - 4
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -749,10 +749,10 @@ select
   </update>
     <update id="updateTaskExamineName">
       update new_order_change n left join (select a.order_no
-           from t_order_new a left join t_order_task b on a.order_no =b.order_no
-                              left join new_order_change c on a.order_no =c.order_no
-           where b.task_receiver in (#{aid},#{taskReceiverId})
-             and c.process_state in (#{type}) group by a.order_no )x on n.order_no =x.order_no
+             from t_order_new a left join t_order_task b on a.order_no =b.order_no
+                                left join new_order_change c on a.order_no =c.order_no
+             where (b.consultant_id in (#{aid},#{taskReceiverId}) or b.manager_id in (#{aid},#{taskReceiverId}))
+               and c.process_state in (#{type}) group by a.order_no)x on n.order_no =x.order_no
       left join (select a.order_no ,group_concat(b.name)name from order_examine a left join admin b on a.aid=b.id
                    where  a.type=0 group by a.order_no ) a on n.order_no =a.order_no
       set n.examine_name =a.name

+ 8 - 2
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -128,10 +128,12 @@ public class AsyncUtils {
 	/**
 	 *
 	 * @param type 1营销管理 2公司管理 3财务管理 4咨询管理
-	 * @param depId
+	 * @param id 管理员id
 	 * @param roleType
 	 */
-	public void updateListExamineName(Integer type, String depId, String roleType) {
+	public void updateListExamineName(Integer type, String id, String roleType) {
+		Admin admin = adminMapper.selectByPrimaryKey(id);
+		String depId=admin.getDepartmentId();
 		String names="";
 		if (type==1){
 			names=getNames(type,depId, roleType);
@@ -147,6 +149,10 @@ public class AsyncUtils {
 			names=getNames(type,depId, roleType);
 			tOrderNewMapper.updateExamineName(ProcessStatus.YPZXSGLY.getCode(),depId,null,names);
 			newOrderChangeMapper.updateExamineName(OrderChangeProcess.JSZJ.getCode(),depId,null,names);
+		}else if (type==5){
+			newOrderChangeMapper.updateTaskExamineName(admin.getId(),admin.getId(),2);
+		}else if (type==6){
+			newOrderChangeMapper.updateTaskExamineName(admin.getId(),admin.getId(),3);
 		}
 	}