Browse Source

客户定期释放新增营销经理

anderx 7 years ago
parent
commit
c499f968b7

+ 1 - 1
src/main/java/com/goafanti/common/dao/UserMapper.java

@@ -227,7 +227,7 @@ public interface UserMapper {
 
 	List<CustomerSimpleBo> selectSignedCustomerByName(@Param("name")String name,@Param("aid")String aid);
 	
-	List<User> selectUserByRoleName(@Param("roleName")String roleName);
+	List<User> selectUserByRoleName(@Param("roleName1")String roleName1,@Param("roleName2")String roleName2);
 	
 	void updateReleaseLock(List<LockingReleaseBo> list);
 

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

@@ -1545,6 +1545,6 @@
   </update>
   
   <select id="selectUserByRoleName" parameterType="java.lang.String" resultMap="BaseResultMap">
-  	select c.id from role a left join user_role b on a.id = b.rid left join admin c on b.uid = c.id where a.role_name = #{roleName}
+  	select c.id from role a left join user_role b on a.id = b.rid left join admin c on b.uid = c.id where a.role_name in(#{roleName1},#{roleName2}) 
   </select>
 </mapper>

+ 3 - 1
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -30,7 +30,7 @@ public class ReleaseUserTask {
 	@RequestMapping(value = "/releaseUser")
 	public void releaseUser(){
 		Date releaseTime = new Date();
-		List<User> userList = userServiceImpl.selectUserByRoleName("营销员");
+		List<User> userList = userServiceImpl.selectUserByRoleName("营销员","营销经理");
 		List<LockingReleaseBo> lockUserList = new ArrayList<LockingReleaseBo>();
 		List<LockingReleaseBo> lockBusinessList = new ArrayList<LockingReleaseBo>();
 		List<LockingReleaseBo> userTmpList = null;
@@ -41,6 +41,8 @@ public class ReleaseUserTask {
 			businessTmpList = customerServiceImpl.selectWaitReleaseBusiness(u.getId());
 			lockBusinessList.addAll(businessTmpList);
 		}
+		System.out.println(lockUserList.toString()+"=============================");
+		System.out.println(lockBusinessList.toString()+"==========================");
 		if(lockUserList.size()>0) customerServiceImpl.updateReleaseLock(lockUserList,releaseTime);
 		if(lockBusinessList.size()>0) customerServiceImpl.updateReleaseLock(lockBusinessList,releaseTime);
 		if(lockUserList.size()>0) userServiceImpl.updateReleaseLock(lockUserList);

+ 1 - 1
src/main/java/com/goafanti/user/service/UserService.java

@@ -66,7 +66,7 @@ public interface UserService {
 	
 	User selectByNumber(String easemobName);
 	
-	List<User> selectUserByRoleName(String roleName);
+	List<User> selectUserByRoleName(String roleName1, String roleName2);
 	
 	void updateReleaseLock(List<LockingReleaseBo> list);
 }

+ 2 - 2
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -369,8 +369,8 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 	}
 	
 	@Override
-	public List<User> selectUserByRoleName(String roleName){
-		return userMapper.selectUserByRoleName(roleName);
+	public List<User> selectUserByRoleName(String roleName1,String roleName2){
+		return userMapper.selectUserByRoleName(roleName1,roleName2);
 	}
 	
 	@Override