添加校长在audit表增加记录

删除时删除相应记录

src/main/java/com/ssj/dao/weixin/library/dao/ILibJoinDao.java

@@ -86,4 +86,12 @@ public interface ILibJoinDao extends JpaRepository<TbLibJoin, String> {
     public List<TbLibJoin>findAllLibList(String city);
 
     List<TbLibJoin> findByLeagueName(String leagueName);
+
+
+    /**
+     *删除audit 记录
+     */
+    @Query(nativeQuery = true, value = " delete from   tb_lib_manager_audit   where lib_manager_id = ?1 ")
+    @Modifying
+    void libAuditDelete(String id);
 }

src/main/java/com/ssj/service/weixin/library/service/ILibJoinService.java

@@ -26,7 +26,7 @@ public interface ILibJoinService extends BaseService<TbLibJoin, String> {
 	   */
 	  Page<Map<String, Object>> findForVIPPage(Map<String, Object> searchParams, Pageable pageable);
 	  
-	  public void libManagerDelete(String id);
+	  public void libManagerDelete(String id,int type);
 	  
 	  public void addAdmin(String ids[],String libId ,Integer type,String mobiles[],String names[]);
 	  

src/main/java/com/ssj/service/weixin/library/service/impl/LibJoinServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.ssj.bean.sys.imlibuser.TbClass;
 import com.ssj.bean.weixin.libmy.domain.TbLibJoin;
 import com.ssj.bean.weixin.libmy.domain.TbLibManager;
+import com.ssj.bean.weixin.libmy.domain.TbLibManagerAudit;
 import com.ssj.dao.weixin.library.dao.ILibJoinDao;
 import com.ssj.dao.weixin.library.dao.ILibJoinQueryDao;
 import com.ssj.framework.basic.utils.DateHelper;
@@ -17,11 +18,14 @@ import com.ssj.framework.core.util.StringUtil;
 import com.ssj.framework.core.util.SystemResourceLocator;
 import com.ssj.framework.weixin.util.BarcodeFactory;
 import com.ssj.service.sys.imlibuser.service.TbClassService;
+import com.ssj.service.weixin.library.service.IBookManagerService;
 import com.ssj.service.weixin.library.service.ILibJoinService;
+import com.ssj.service.weixin.library.service.LibManagerAuditService;
 import com.ssj.service.weixin.sales.service.LibBorrowedServiceService;
 import com.ssj.service.weixin.sales.service.LibCommissionService;
 import com.ssj.service.weixin.sales.service.LibSalesPriceService;
 import com.ssj.service.weixin.user.service.UserService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -56,6 +60,12 @@ public class LibJoinServiceImpl extends BaseServiceImpl<TbLibJoin, String> imple
 
 	@Autowired
 	private TbClassService tbClassService;
+
+	@Autowired
+	private IBookManagerService managerService;
+
+	@Autowired
+	private LibManagerAuditService auditService;
 	 
 	 
 	@Override
@@ -77,15 +87,18 @@ public class LibJoinServiceImpl extends BaseServiceImpl<TbLibJoin, String> imple
 	}
 
 	@Override
-	public void libManagerDelete(String id) {
+	public void libManagerDelete(String id,int type) {
 		libJoinDao.libManagerDelete(id);
-		
+		if(type == 4){
+			//删除audit 记录
+			libJoinDao.libAuditDelete(id);
+		}
 	}
 
 	@Override
 	public void addAdmin(String[] ids, String libId ,Integer type,String mobiles[],String names[]) {
 		if(ids.length>0){
-			List<TbLibManager> list = new  ArrayList<TbLibManager>();
+			Date now = new Date();
 			TbLibJoin join =  this.getById(libId);
 			for (int i = 0; i < ids.length; i++) {
 				String userId = ids[i];
@@ -99,11 +112,10 @@ public class LibJoinServiceImpl extends BaseServiceImpl<TbLibJoin, String> imple
 					tb.setTelephone(mobiles[i]);
 				}
 
-				tb.setCreateTime(new Date());
+				tb.setCreateTime(now);
 				tb.setLibtype(join.getLibtype()>1?2:1);
 				tb.setState(1);
-				list.add(tb);
-
+				tb = managerService.save(tb);
 				if(type==1){
 					userId="JIEYUE"+userId;//图书借阅
 		         }else if(type==2){
@@ -113,10 +125,25 @@ public class LibJoinServiceImpl extends BaseServiceImpl<TbLibJoin, String> imple
 		         }else{
 		        	 userId ="CD"+userId;
 		         }
+				if(type==4){
+					//校长，插入audit记录
+					TbLibManagerAudit  audit = new  TbLibManagerAudit();
+					audit.setStatus(1);
+					audit.setTelephone(tb.getTelephone());
+					audit.setLibManagerId(tb.getId());
+					audit.setLibId(tb.getLibId());
+					audit.setType(tb.getType());
+					audit.setCreateTime(now);
+					audit.setLastUpdateTime(now);
+					audit.setUserId(tb.getUserId());
+					audit.setName(tb.getName());
+					//BeanUtils.copyProperties(tb,audit);
+					auditService.save(audit);
+				}
 				 tokenManager.createManageType(userId,libId);
 				 tokenManager.delToken(userId);
 			}
-			libJoinQueryDao.insertTbLibManager(list);
+			//libJoinQueryDao.insertTbLibManager(list);
 		}
 	}
 
@@ -163,7 +190,8 @@ public class LibJoinServiceImpl extends BaseServiceImpl<TbLibJoin, String> imple
 	public List<Map<String, Object>> getNoLocationJoin(Integer type) {
 		return libJoinQueryDao.getNoLocationJoin(type);
 	}
-	
+
+	@Override
 	 public List<TbLibJoin> getLibJoinByCode(List<String> orgCode){
 		if(orgCode!=null&&orgCode.size()>0){
 			return libJoinDao.getLibJoinByCode(orgCode);

src/main/java/com/ssj/sys/controller/SysLibController.java

@@ -263,18 +263,19 @@ public class SysLibController extends BaseController {
 		 Response response = new  Response();
 		 TbLibManager manager= managerService.getById(id);
 		 String userId = manager.getUserId();
-		 if(manager.getType()==1){
+		 int type = manager.getType();
+		 if(type==1){
 			 userId="JIEYUE"+userId;//图书借阅
-         }else if(manager.getType()==2){
+         }else if(type==2){
         	 userId ="ZUOYB"+userId;//作业吧
-         }else if(manager.getType()==3){
+         }else if(type==3){
         	 userId ="XUEBA"+userId; //学霸老师
          }else{
         	 userId ="CD"+userId; //学霸老师
          }
 		 tokenManager.createManageType(userId,"0");
 		 tokenManager.delToken(manager.getUserId());
-		 libJoinService.libManagerDelete(manager.getId());
+		 libJoinService.libManagerDelete(manager.getId(),type);
 		 response.success();
 		 return response;
 	 }