Browse Source

外呼系统开发

anderx 1 year ago
parent
commit
471850a2a5

+ 3 - 3
src/main/java/com/goafanti/business/service/impl/RestrictProjectServiceImpl.java

@@ -114,7 +114,7 @@ public class RestrictProjectServiceImpl extends BaseMybatisDao<RestrictProjectMa
             if (e.getType()==0&&u.getAid()!=null&&u.getAid().equals(AFTConstants.CAOJIN_AID)){
                 e.setType(1);
                 if (aname==null){
-                    Admin admin = adminMapper.selectByPrimaryKey(AFTConstants.CAOJIN_AID);
+                    Admin admin = adminMapper.queryById(AFTConstants.CAOJIN_AID);
                     aname  =admin.getName();
                 }
                 e.setAdminName(aname);
@@ -227,7 +227,7 @@ public class RestrictProjectServiceImpl extends BaseMybatisDao<RestrictProjectMa
     public Object getRestrictProjectUser(String ids) {
         List<UserRestrictProjectBo> list = new ArrayList<>();
         String aid=TokenManager.getAdminId();
-        Admin my = adminMapper.selectByPrimaryKey(aid);
+        Admin my = adminMapper.queryById(aid);
         boolean flag= my.getPublicPurview() == 1;
         if (ids!=null&& !ids.isEmpty()){
             String[] split = ids.split(",");
@@ -256,7 +256,7 @@ public class RestrictProjectServiceImpl extends BaseMybatisDao<RestrictProjectMa
                             }else{
                                 //没有限定
                                 bo.setType(2);
-                                Admin admin = adminMapper.selectByPrimaryKey(user.getAid());
+                                Admin admin = adminMapper.queryById(user.getAid());
                                 bo.setAdminName(admin.getName());
                             }
                         }

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

@@ -338,7 +338,7 @@ public class AsyncUtils {
 				noticeType=sotpType==0?NoticeStatus.PROJECT_SOPT_NO.getCode() :NoticeStatus.PROJECT_RENEW_NO.getCode();
 				String str=String.format("客户名称[%s]订单编号[%s]项目编号[%s],已经被驳回。",tOrderNew.getUserName(),task.getOrderNo(),task.getId());
 				if (tOrderNew.getSalesmanId()!=null){
-					Admin admin = adminMapper.selectByPrimaryKey(tOrderNew.getSalesmanId());
+					Admin admin = adminMapper.queryById(tOrderNew.getSalesmanId());
 					addNotic( noticeType,admin.getId(), str);
 					send(new EmailBo(NoticeStatus.getValueByCode(noticeType),admin.getEmail(),str));
 				}
@@ -346,7 +346,7 @@ public class AsyncUtils {
 		}
 
 	private void pushParam(String id, Integer noticeType, String str, List<Notice> notes, StringBuffer emails) {
-		Admin admin = adminMapper.selectByPrimaryKey(id);
+		Admin admin = adminMapper.queryById(id);
 		pushParam(admin,noticeType,str,notes,emails);
 
 	}
@@ -533,8 +533,8 @@ public class AsyncUtils {
 			noc.setExamineName(ton.getSalesmanName());
 		}else if (noc.getProcessState()== OrderChangeProcess.YXJL.getCode()){
 			TOrderNewBo ton = tOrderNewMapper.getSaleIdByOno(noc.getOrderNo());
-			Admin saleman = adminMapper.selectByPrimaryKey(ton.getSalesmanId());
-			Admin manager = adminMapper.selectByPrimaryKey(saleman.getManagerId());
+			Admin saleman = adminMapper.queryById(ton.getSalesmanId());
+			Admin manager = adminMapper.queryById(saleman.getManagerId());
 			noc.setExamineName(manager.getName());
 		}else if (noc.getProcessState()== OrderChangeProcess.YXGLY.getCode()){
 			TOrderNewBo ton = tOrderNewMapper.getSaleIdByOno(noc.getOrderNo());
@@ -837,7 +837,7 @@ public class AsyncUtils {
 
 
 	public void sendWeChat( String publicCarbonCopy,Integer id, String name, String startTime, String endTime, String typeName, String plan) {
-		Admin admin = adminMapper.selectByPrimaryKey(publicCarbonCopy);
+		Admin admin = adminMapper.queryById(publicCarbonCopy);
 		weChatUtils.addSendCopyNotice(admin.getOpenId(), id, name, startTime, endTime, typeName, plan);
 	}
 	public void updateAdminByAid(String aid,String aid2) {

+ 10 - 10
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -368,7 +368,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		if(in.getNewChannel()!=null)user.setNewChannel(in.getNewChannel());
 		user.setChannel(0);
 		passwordUtil.encryptPassword(user);
-		String aname = adminMapper.selectByPrimaryKey(TokenManager.getAdminId()).getName();
+		String aname = adminMapper.queryById(TokenManager.getAdminId()).getName();
 		if (Objects.equals(in.getType(), UserType.PERSONAL.getCode())) {
 			if (!userMapper.checkUser("", "", in.getContactMobile(), in.getType(), null, null).isEmpty())
 				throw new BusinessException(new Error(ErrorConstants.CUSTOMER_ALREADY_EXIST, in.getName(), ""));
@@ -631,7 +631,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		um.setUid(uid);
 		String aid=TokenManager.getAdminId();
 		um.setUpdateAid(aid);
-		Admin a=adminMapper.selectByPrimaryKey(aid);
+		Admin a=adminMapper.queryById(aid);
 		um.setUpdateName(a.getName());
 		int i=userMidMapper.updateByUid(um);
 		if (i==0) {
@@ -1172,7 +1172,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 						ocb.setId(UUID.randomUUID().toString());
 						ocb.setUid(uid);
 						ocb.setAid(TokenManager.getAdminId());
-						Admin ad = adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+						Admin ad = adminMapper.queryById(TokenManager.getAdminId());
 						ocb.setAname(ad.getName());
 						organizationContactBookMapper.insert(ocb);
 					} else {
@@ -1506,7 +1506,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		if(uList.isEmpty())uList.add(uid);
 		//先查出所有在其他审核的公出
 		List<PublicReleaseTransferUserBo> list=publicExamineMapper.selectByuList(uList);
-		Admin admin = adminMapper.selectByPrimaryKey(aid);
+		Admin admin = adminMapper.queryById(aid);
 		Integer logStatus=null;
 		String logMsg=null;
 		StringBuffer content=null;
@@ -1521,7 +1521,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 				pr.setId(e.getId());
 				pr.setPublicType(0);
 				publicReleaseMapper.update(pr);
-				Admin sendAdmin=adminMapper.selectByPrimaryKey(admin.getReviewer());
+				Admin sendAdmin=adminMapper.queryById(admin.getReviewer());
 				noticeAid=sendAdmin.getId();
 				logStatus=2;
 				logMsg="转交客户到发起公出审核人,自动审核通过。";
@@ -1560,8 +1560,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			tOrderNewMapper.update(bo);
 			TOrderMid mid=new TOrderMid();
 			mid.setOrderNo(bo.getOrderNo());
-			Admin admin = adminMapper.selectByPrimaryKey(aid);
-			Admin oldadmin = adminMapper.selectByPrimaryKey(oldAid);
+			Admin admin = adminMapper.queryById(aid);
+			Admin oldadmin = adminMapper.queryById(oldAid);
 			mid.setSalesmanName(admin.getName());
 			tOrderMidMapper.updateByOrderNo(mid);
 			TOrderLog log=new TOrderLog();
@@ -1995,7 +1995,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	public int addOneContact(OrganizationContactBook ocb) {
 		ocb.setAid(TokenManager.getAdminId());
 		ocb.setId(UUID.randomUUID().toString());
-		Admin ad = adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+		Admin ad = adminMapper.queryById(TokenManager.getAdminId());
 		ocb.setAname(ad.getName());
 		if (ocb.getMajor()==1){
 			organizationContactBookMapper.updateSubContact(ocb.getUid());
@@ -2523,7 +2523,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		uf.setGuidance(guidance);
 		uf.setGuidanceTime(new Date());
 		String aid=TokenManager.getAdminId();
-		Admin a=adminMapper.selectByPrimaryKey(aid);
+		Admin a=adminMapper.queryById(aid);
 		uf.setGuidanceAid(a.getId());
 		uf.setGuidanceName(a.getName());
 		userFollowMapper.pushUserGuidance(followId, 1);
@@ -2771,7 +2771,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	}
 
 	private Object pushRetrun(Pagination<?> page) {
-		Admin admin = adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+		Admin admin = adminMapper.queryById(TokenManager.getAdminId());
 		List<CustomerSimpleBo> list = (List<CustomerSimpleBo>) page.getList();
 		//公出权限 0正常 1全部   =1的用户,公出status=0(应该是不用审核)
 		//不然,就是 客户是公共客户   status=2

+ 1 - 2
src/main/java/com/goafanti/customer/service/impl/UserArchivesServiceImpl.java

@@ -7,7 +7,6 @@ import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.InputSelectUserArchives;
-import com.goafanti.customer.bo.OutSelectUserArchives;
 import com.goafanti.customer.bo.MyUserDetailsBo;
 import com.goafanti.customer.bo.OutSelectUserArchives;
 import com.goafanti.customer.bo.UserArchivesDetails;
@@ -192,7 +191,7 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
 
     private void addUserLog(UserArchives userArchives) {
         UserArchives use = userArchivesMapper.queryById(userArchives.getId());
-        Admin admin = adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+        Admin admin = adminMapper.queryById(TokenManager.getAdminId());
         List<UserDataLog> list =new ArrayList<>();
         if(userArchives.getFinancialData()!=null&&!Objects.equals(use.getFinancialData(),userArchives.getFinancialData())){
             String builder = admin.getName() + "修改了财务数据: " + use.getFinancialData() + "=>" + userArchives.getFinancialData();

+ 10 - 10
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -120,7 +120,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             in.setTargetType(1);
         }
         if (in.getAid()==null)in.setAid(TokenManager.getAdminId());
-        Admin admin = adminMapper.selectByPrimaryKey(in.getAid());
+        Admin admin = adminMapper.queryById(in.getAid());
         in.setAname(admin.getName());
         in.setApplyDep(admin.getDepartmentId());
         in.setPayDep(admin.getDepartmentId());
@@ -225,7 +225,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         String aid=TokenManager.getAdminId();
         addExpenseAccountLog(in.getId(),status,in.getProcessStatus(),aid,str);
         if (status==0)in.setProcessStatus(1);
-        Admin admin = adminMapper.selectByPrimaryKey(aid);
+        Admin admin = adminMapper.queryById(aid);
         if (admin.getExpenseSuperExamine()==0){
             String str2=String.format("未设置[%s]审核。",EAProcessStatus.getDesc(in.getProcessStatus()));
             Date date=new Date();
@@ -261,7 +261,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         StringBuffer aname =new StringBuffer();
         for (ExpenseAccountExamine e : list) {
             if (e.getProcessStatus()==in.getProcessStatus()&&e.getStatus()==0){
-                Admin ad = adminMapper.selectByPrimaryKey(e.getAuditor());
+                Admin ad = adminMapper.queryById(e.getAuditor());
                 aids.add(ad);
                 aname=aname.append(ad.getName()).append(",");
             }
@@ -970,7 +970,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 if (expenseExamine){
                     //完成后的流程
                     status =2;
-                    aids.add(adminMapper.selectByPrimaryKey(admin.getId()));
+                    aids.add(adminMapper.queryById(admin.getId()));
 
                     newEa.setStatus(status);
                     newEa.setExamineName("");
@@ -980,7 +980,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                     StringBuffer aname =new StringBuffer();
                     for (ExpenseAccountExamine e : list) {
                         if (e.getStatus()==0){
-                            Admin ad=adminMapper.selectByPrimaryKey(e.getAuditor());
+                            Admin ad=adminMapper.queryById(e.getAuditor());
                             aids.add(ad);
                             aname=aname.append(ad.getName()).append(",");
                         }
@@ -1015,7 +1015,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                     }else {
                         //完成后的流程
                         status =2;
-                        aids.add(adminMapper.selectByPrimaryKey(admin.getId()));
+                        aids.add(adminMapper.queryById(admin.getId()));
                         newEa.setStatus(status);
                         newEa.setExamineName("");
                     }
@@ -1026,7 +1026,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             }
 
         }else {
-            aids.add(adminMapper.selectByPrimaryKey(admin.getId()));
+            aids.add(adminMapper.queryById(admin.getId()));
             newEa.setStatus(3);
             newEa.setProcessStatus(0);
             str.setLength(0);
@@ -1042,7 +1042,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         StringBuffer aname =new StringBuffer();
         for (ExpenseAccountExamine e : list) {
             if (e.getProcessStatus()== newEa.getProcessStatus()&&e.getStatus()==0){
-                Admin ad=adminMapper.selectByPrimaryKey(e.getAuditor());
+                Admin ad=adminMapper.queryById(e.getAuditor());
                 aids.add(ad);
                 aname=aname.append(ad.getName()).append(",");
             }
@@ -1358,7 +1358,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         if (in.getAid()==null){
             in.setAid(TokenManager.getAdminId());
         }
-        Admin admin = adminMapper.selectByPrimaryKey(in.getAid());
+        Admin admin = adminMapper.queryById(in.getAid());
         in.setAname(admin.getName());
         in.setApplyDep(admin.getDepartmentId());
         in.setPayDep(admin.getDepartmentId());
@@ -1465,7 +1465,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 if(!expenseAccounts.isEmpty()){
                     for (ExpenseAccount ea : expenseAccounts) {
                         count=count.add(ea.getRealAmount());
-                        Admin admin = adminMapper.selectByPrimaryKey(ea.getAid());
+                        Admin admin = adminMapper.queryById(ea.getAid());
                         if (admin.getPosition()!=null){
                             if (admin.getPosition().equals("1")){
                                 yxyCount=yxyCount.add(ea.getRealAmount());

+ 4 - 4
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -559,7 +559,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		if (nb.getProcessState().equals(OrderChangeProcess.YXY.getCode())){
 			alist.add(o.getSalesmanId());
 		} else if (nb.getProcessState().equals(OrderChangeProcess.YXJL.getCode())) {
-			Admin saleaman = adminMapper.selectByPrimaryKey(o.getSalesmanId());
+			Admin saleaman = adminMapper.queryById(o.getSalesmanId());
 			alist.add(saleaman.getManagerId());
 		}else if (nb.getProcessState().equals(OrderChangeProcess.YXGLY.getCode())) {
 			alist.addAll(adminMapper.listNameByDepAndName(o.getOrderDep(), AFTConstants.SALESMAN_ADMIN));
@@ -853,8 +853,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			noc.setExamineName(ton.getSalesmanName());
 		}else if (noc.getProcessState()== OrderChangeProcess.YXJL.getCode()){
 			TOrderNewBo ton = tOrderNewMapper.getSaleIdByOno(noc.getOrderNo());
-			Admin saleman = adminMapper.selectByPrimaryKey(ton.getSalesmanId());
-			Admin manager = adminMapper.selectByPrimaryKey(saleman.getManagerId());
+			Admin saleman = adminMapper.queryById(ton.getSalesmanId());
+			Admin manager = adminMapper.queryById(saleman.getManagerId());
 			noc.setExamineName(manager.getName());
 		}else if (noc.getProcessState()== OrderChangeProcess.YXGLY.getCode()){
 			TOrderNewBo ton = tOrderNewMapper.getSaleIdByOno(noc.getOrderNo());
@@ -918,7 +918,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				StringBuilder str=new StringBuilder();
 				if (Objects.equals(noc.getProcessState(), OrderChangeProcess.TPSH.getCode())){
 					Department department = tOrderNewMapper.selectDepByOrderNo(noc.getOrderNo());
-					Admin a = adminMapper.selectByPrimaryKey(department.getApprovalAid());
+					Admin a = adminMapper.queryById(department.getApprovalAid());
                     str.append(a.getName()).append(",");
                 }else if(Objects.equals(noc.getProcessState(), OrderChangeProcess.DSZ.getCode())){
 					List<Admin> admins = adminMapper.getAdminRoleTypeList(AFTConstants.APPROVAL_DECISION);

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java

@@ -359,7 +359,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 		}
 		if (type ==1&&!TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
 			//如果是省外则直接查本部门
-			Admin a=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+			Admin a=adminMapper.queryById(TokenManager.getAdminId());
 			params.put("aDep", a.getDepartmentId());
 		}
 		return (Pagination<TOrderInvoiceBo>)findPage("approvalOrderInvoiceList", "approvalOrderInvoiceCount", params, pageNo, pageSize);

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

@@ -181,7 +181,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		t.setDeleteSign(0);
 		t.setSalesmanId(TokenManager.getAdminId());
 		t.setCreater(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
-		t.setOrderDep(adminMapper.selectByPrimaryKey(TokenManager.getAdminId()).getDepartmentId());
+		t.setOrderDep(adminMapper.queryById(TokenManager.getAdminId()).getDepartmentId());
 		t.setCreateTime(date);
 		t.setUpdateTime(date);
 		t.setBuyerId(uid);
@@ -520,7 +520,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			contactBook.setMobile(t.getContactMobile());
 			organizationContactBookMapper.insertSelective(contactBook);
 		}
-		Admin a = adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+		Admin a = adminMapper.queryById(TokenManager.getAdminId());
 		if (StringUtils.isBlank(t.getOrderDep())) {
 			t.setOrderDep(a.getDepartmentId());
 		}
@@ -599,7 +599,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			if (t.getProcessStatus()==ProcessStatus.YPYXJL.getCode()){
 				type=NoticeStatus.ORDER_START.getCode();
 				aids.add(a.getManagerId());
-				Admin manager = adminMapper.selectByPrimaryKey(a.getManagerId());
+				Admin manager = adminMapper.queryById(a.getManagerId());
 				str=str.append(manager.getName()).append(",");
 			}else if (t.getProcessStatus()==ProcessStatus.YPYXGLY.getCode()){
 				type=NoticeStatus.ORDER_YES.getCode();
@@ -1502,11 +1502,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	public void pushExamineName(TOrderNew t){
 		StringBuffer str =new StringBuffer();
 		if (t.getProcessStatus()==ProcessStatus.YPYXY.getCode()){
-			Admin admin = adminMapper.selectByPrimaryKey(t.getSalesmanId());
+			Admin admin = adminMapper.queryById(t.getSalesmanId());
 			t.setExamineName(admin.getName());
 		}else if (t.getProcessStatus()==ProcessStatus.YPYXJL.getCode()){
-			Admin a = adminMapper.selectByPrimaryKey(t.getSalesmanId());
-			Admin admin = adminMapper.selectByPrimaryKey(a.getManagerId());
+			Admin a = adminMapper.queryById(t.getSalesmanId());
+			Admin admin = adminMapper.queryById(a.getManagerId());
 			t.setExamineName(admin.getName());
 		}else if (t.getProcessStatus()==ProcessStatus.YPYXGLY.getCode()){
 			if (t.getOrderDep()!=null){
@@ -2325,7 +2325,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				aids.add(admin.getId());
 			}
 			TOrderNew t2= checkDeleteSign(o.getOrderNo());
-			Admin a =adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+			Admin a =adminMapper.queryById(TokenManager.getAdminId());
 			OutsourceLog ol=new OutsourceLog(o.getTid(),0,o.getReason(), TokenManager.getAdminId(),a.getName());
 			outsourceLogMapper.insertSelective(ol);
 			TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(o.getOrderNo());

+ 3 - 3
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -161,7 +161,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		t.setTaskAllocator(TokenManager.getAdminId());
 		t.setTaskReceiver(taskReceiverId);
 		t.setTaskDistributionTime(date);
-		Admin a=adminMapper.selectByPrimaryKey(taskReceiverId);
+		Admin a=adminMapper.queryById(taskReceiverId);
 		insetLog(taskId, taskReceiverId);
 		addtaskAttributionLog(taskId,taskReceiverId,remarks,type,date);
 		if (a==null||a.getId()==null) {
@@ -1722,7 +1722,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 					Department department = tOrderNewMapper.selectDepByOrderNo(b.getOrderNo());
 					//部门设置无需特批的情况下直接完成,否则走正常流程
 					if (department.getApproval()==1){
-						admins.add(adminMapper.selectByPrimaryKey(department.getApprovalAid()));
+						admins.add(adminMapper.queryById(department.getApprovalAid()));
 					}
 				}
 			} else if(shiroType==1){
@@ -1815,7 +1815,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	 * @param content
 	 */
 	private EmailBo sendMemberEmail(Integer type,String aid,String content) {
-		Admin admin = adminMapper.selectByPrimaryKey(aid);
+		Admin admin = adminMapper.queryById(aid);
 		EmailBo bo = new EmailBo(NoticeStatus.getValueByCode(type), admin.getEmail(),content);
 		return bo;
 	}

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OutsourceOrgServiceImpl.java

@@ -135,7 +135,7 @@ public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapp
 		}else if (o.getType()==1) {//项目外包
 			TOrderTask tt=tOrderTaskMapper.queryById(o.getTid());
 			aids.add(tt.getTaskReceiver());
-			Admin a =adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+			Admin a =adminMapper.queryById(TokenManager.getAdminId());
 			OutsourceLog ol=new OutsourceLog();
 			ol.setAid(TokenManager.getAdminId());
 			ol.setAname(a.getName());

+ 2 - 2
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -396,7 +396,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 			}
 		} else if (Objects.equals(useDep.getOperationGuaranteeId(),in.getOperationGuaranteeId())) {
 			List<String> strings = torderNewMapper.selectByDepAndProcess(useDep.getId(), ProcessStatus.YYBZSH.getCode());
-			Admin admin = adminMapper.selectByPrimaryKey(in.getOperationGuaranteeId());
+			Admin admin = adminMapper.queryById(in.getOperationGuaranteeId());
 			for (String s : strings) {
 				TOrderNew newOrder = new TOrderNew();
 				newOrder.setOrderNo(s);
@@ -556,7 +556,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 	 */
 	private void addExamine(Department useDep, String aid,List<String> list) {
 		List<String> strings = torderNewMapper.selectByDepAndProcess(useDep.getId(), ProcessStatus.YPCW_JSZJ.getCode());
-		Admin admin = adminMapper.selectByPrimaryKey(aid);
+		Admin admin = adminMapper.queryById(aid);
 		if (!strings.isEmpty()){
 			for (String s : strings) {
 				torderExamineMapper.insertSelective(new TOrderExamine(s,0,admin.getId(),admin.getName()));

+ 1 - 1
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -1176,7 +1176,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 					ss.add(o.getId().toString());
 					tOrderPaymentMapper.updateByPrimaryKeySelective(t);
 			}
-			Admin a=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+			Admin a=adminMapper.queryById(TokenManager.getAdminId());
 			if (!list.isEmpty()&&a.getAid()!=null) {
 				paymentLogMapper.insertBatch(ss, a.getAid(), a.getName(), "切换取消支付", 4);
 			}

+ 6 - 6
src/main/java/com/goafanti/patent/service/impl/PatentNewServiceImpl.java

@@ -66,7 +66,7 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 
 	@Override
 	public int updatePatenNew(PatentNewBo p) {
-		Admin a = adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+		Admin a = adminMapper.queryById(TokenManager.getAdminId());
 		PatentNew pn=patentNewMapper.selectByPrimaryKey(p.getId());
 		StringBuffer str=new StringBuffer(a.getName());
 		if (!p.getApplyDate().equals(pn.getApplyDate())
@@ -411,7 +411,7 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 		n.setCreateTime(date);
 		n.setReaded(0);// 未读
 		n.setNoticeType(NoticeStatus.TASK_PATENT_ERROR.getCode());
-		Admin a = adminMapper.selectByPrimaryKey(p.getAid());
+		Admin a = adminMapper.queryById(p.getAid());
 		StringBuffer str2 = new StringBuffer();
 		str2.append("专利编号[").append(p.getPatentNo()).append("],名称[").append(p.getName()).append("],email[")
 				.append(p.getEmail().trim()).append("]");
@@ -583,7 +583,7 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 				}
 			}
 			for (PatentNew patentNew : lp) {
-				Admin a = adminMapper.selectByPrimaryKey(patentNew.getAid());
+				Admin a = adminMapper.queryById(patentNew.getAid());
 				String userName = patentNewMapper.selectUserNameByTid(patentNew.getTid());
 				if (StringUtils.isEmpty(userName)){
 					userName=patentNew.getHolders();
@@ -612,8 +612,8 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 	private void addPatentNewLog(Integer type, List<String> ls,String aid) {
 		List<PatentNewLog> log=new ArrayList<PatentNewLog>();
 		Date date=new Date();
-		Admin a=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
-		Admin s=adminMapper.selectByPrimaryKey(aid);
+		Admin a=adminMapper.queryById(TokenManager.getAdminId());
+		Admin s=adminMapper.queryById(aid);
 		for (String str : ls) {
 			PatentNewLog pl=new PatentNewLog();
 			pl.setPid(Integer.valueOf(str));
@@ -714,7 +714,7 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 	@Override
 	public void updateCostReduction(Integer id) {
 		List<PatentNew> list =patentNewMapper.selectByTid(id);
-		Admin	a=	adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+		Admin	a=	adminMapper.queryById(TokenManager.getAdminId());
 		for (PatentNew p : list) {
 			PatentNew pn=new PatentNew();
 			pn.setId(p.getId());

+ 11 - 39
src/main/java/com/goafanti/personnel/service/impl/PersonnelServiceImpl.java

@@ -1,50 +1,22 @@
 package com.goafanti.personnel.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.AdminMapper;
-import com.goafanti.common.dao.PersonnelChooseMapper;
-import com.goafanti.common.dao.PersonnelContactMapper;
-import com.goafanti.common.dao.PersonnelContractMapper;
-import com.goafanti.common.dao.PersonnelDossierMapper;
-import com.goafanti.common.dao.PersonnelEntryMapper;
-import com.goafanti.common.dao.PersonnelLevelMapper;
-import com.goafanti.common.dao.PersonnelMidMapper;
-import com.goafanti.common.dao.PersonnelPromotionMapper;
-import com.goafanti.common.dao.PersonnelQuitMapper;
-import com.goafanti.common.dao.PersonnelWelfareMapper;
-import com.goafanti.common.model.Admin;
-import com.goafanti.common.model.PersonnelContact;
-import com.goafanti.common.model.PersonnelDossier;
-import com.goafanti.common.model.PersonnelEntry;
-import com.goafanti.common.model.PersonnelMid;
-import com.goafanti.common.model.PersonnelWelfare;
+import com.goafanti.common.dao.*;
+import com.goafanti.common.model.*;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.personnel.bo.InputPersonnelBo;
-import com.goafanti.personnel.bo.InputPersonnelChooseBo;
-import com.goafanti.personnel.bo.InputPersonnelContactBo;
-import com.goafanti.personnel.bo.InputPersonnelContractBo;
-import com.goafanti.personnel.bo.InputPersonnelEntryBo;
-import com.goafanti.personnel.bo.InputPersonnelListBo;
-import com.goafanti.personnel.bo.InputPersonnelLvlBo;
-import com.goafanti.personnel.bo.InputPersonnelPromotionBo;
-import com.goafanti.personnel.bo.InputPersonnelQuitBo;
-import com.goafanti.personnel.bo.IntpersonnelWelfareBo;
-import com.goafanti.personnel.bo.OutPersonnelBo;
-import com.goafanti.personnel.bo.OutPersonnelListBo;
-import com.goafanti.personnel.bo.OutPersonnelLvlBo;
+import com.goafanti.personnel.bo.*;
 import com.goafanti.personnel.service.PersonnelService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper> implements PersonnelService {
@@ -74,7 +46,7 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 	@Override
 	public int addPersonnel(InputPersonnelBo i) {
 		if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)) {
-			Admin a=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+			Admin a=adminMapper.queryById(TokenManager.getAdminId());
 			if (a!=null) {
 				i.setCompany(a.getDepartmentId());
 			}

+ 4 - 4
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -402,7 +402,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		c.setCreateTime(new Date());
 		contractTaskLogMapper.insert(c);*/
 		//contractTaskMapper.updateByPrimaryKeySelective(task);
-		Admin a=adminMapper.selectByPrimaryKey(task.getTaskReceiver());
+		Admin a=adminMapper.queryById(task.getTaskReceiver());
 		Admin ad=null;
 		String regex = "^(1[1-9][0-9])\\d{8}$";
 		Pattern p = Pattern.compile(regex);
@@ -412,7 +412,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		if (null!=tb&&tb.getOrderNo()!=null) {
 			ServiceOrderDetailBo t=tOrderMapper.selectServiceOrderDetail(tb.getOrderNo());
 			if (null!=t&&t.getSalesmanId()!=null) {
-				ad=adminMapper.selectByPrimaryKey(t.getSalesmanId());
+				ad=adminMapper.queryById(t.getSalesmanId());
 				if(null!=ad&&null!=ad.getContactMobile()){
 				Matcher s1 = p.matcher(ad.getContactMobile());
 				if (s1.matches()) {
@@ -549,14 +549,14 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 			contractTaskLogMapper.insert(c);
 			contractTaskMapper.updateByPrimaryKeySelective(task);
 			TaskDetailBo t=contractTaskMapper.selectByOrderNoAndUserName(taskId);
-			Admin a=adminMapper.selectByPrimaryKey(taskReceiverId);
+			Admin a=adminMapper.queryById(taskReceiverId);
 			String regex = "^(1[1-9][0-9])\\d{8}$";
 			 Pattern p = Pattern.compile(regex);
 			 String mobile="";
 			 if (null!=t&&t.getOrderNo()!=null) {
 					TOrder tb=tOrderMapper.selectByPrimaryKey(t.getOrderNo());
 					if (null!=tb&&tb.getSalesmanId()!=null) {
-						Admin ad=adminMapper.selectByPrimaryKey(tb.getSalesmanId());
+						Admin ad=adminMapper.queryById(tb.getSalesmanId());
 					if (null!=ad&&null!=ad.getContactMobile()){
 						Matcher s1 = p.matcher(ad.getContactMobile());
 						if(s1.matches()){