Przeglądaj źródła

营销首页修改

anderx 11 miesięcy temu
rodzic
commit
dc892e4f53

+ 4 - 11
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -8,7 +8,10 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.*;
 import com.goafanti.common.error.BusinessException;
-import com.goafanti.common.model.*;
+import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.Department;
+import com.goafanti.common.model.FinanceCount;
+import com.goafanti.common.model.UserBusiness;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.PasswordUtil;
 import com.goafanti.common.utils.StringUtils;
@@ -49,8 +52,6 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 	@Autowired
 	private NewAdminService newAdminService;
 	@Autowired
-	private AdminUserCountMapper adminUserCountMapper;
-	@Autowired
 	private TOrderNewMapper TOrderNewMapper;
 	@Autowired
 	private ExpenseAccountMapper expenseAccountMapper;
@@ -776,15 +777,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 		}
 	}
 
-	private void publiAdminUserCount(List<AdminUserCount> list) {
-		for (AdminUserCount e : list) {
 
-			int i=adminUserCountMapper.updateByAidAndDateSelective(e);
-			if (i==0){
-				adminUserCountMapper.insertSelective(e);
-			}
-		}
-	}
 
 
 }

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

@@ -68,8 +68,6 @@ public class AsyncUtils {
 	@Resource
 	private TOrderPaymentMapper tOrderPaymentMapper;
 	@Resource
-	private AdminUserCountMapper adminUserCountMapper;
-	@Resource
 	private FinanceCountMapper financeCountMapper;
 	@Resource
 	private WeChatUtils weChatUtils;
@@ -77,48 +75,8 @@ public class AsyncUtils {
 	private AdminProjectStatisticsMapper adminProjectStatisticsMapper;
 
 
-	/**
-	 * 处理离职意见转交客户
-	 * 	转出去则全部为0,转入则判定当天有没有,有则修改没有新增
-	 * @param aid
-	 */
-    public  void updateAdminUserCount(String aid, List<AdminUserCount> tramsferList) {
-		adminUserCountMapper.updateUserCountResetting(aid);
-		pushAdminUserCount(tramsferList);
-	}
 
-	private void pushAdminUserCount(List<AdminUserCount> list) {
-		for (AdminUserCount e : list) {
-			String startTime=DateUtils.formatDate(e.getDateTime(),AFTConstants.YYYYMMDD);
-			AdminUserCount selectAUC = getAdminUserCount(e.getAid(),startTime);
-			if (selectAUC==null){
-				adminUserCountMapper.insertSelective(e);
-			}else {
-				AdminUserCount newAUC=new AdminUserCount();
-				newAUC.setId(selectAUC.getId());
-				if (e.getPrivateCount()==null)selectAUC.setPrivateCount(0);
-				if (e.getChannelCount()==null)selectAUC.setChannelCount(0);
-				if (e.getSignCount()==null)selectAUC.setSignCount(0);
-				newAUC.setPrivateCount(e.getPrivateCount());
-				newAUC.setChannelCount(e.getChannelCount());
-				newAUC.setSignCount(e.getSignCount());
-				adminUserCountMapper.updateByPrimaryKeySelective(newAUC);
-			}
-		}
-	}
 
-	private AdminUserCount getAdminUserCount(String aid, String startTime) {
-		List<AdminUserCount> selectList = adminUserCountMapper.selectByaidAndDate(aid, startTime);
-		AdminUserCount selectAUC=null;
-		if (selectList.size()==1){
-			selectAUC=selectList.get(0);
-		}else if (selectList.size()>1){
-			for (int i=1;i<selectList.size();i++){
-				adminUserCountMapper.deleteByPrimaryKey(selectList.get(i).getId());
-			}
-		}
-		return selectAUC;
-	}
 
 
     public void patentSend(EmailBo bo) throws UnsupportedEncodingException, MessagingException {
@@ -813,27 +771,7 @@ public class AsyncUtils {
 		}
 	}
 
-	public void updateAdminUserOrderCount(List<AdminUserCount> tramsferList) {
-		for (AdminUserCount e : tramsferList) {
-			String startTime=DateUtils.formatDate(e.getDateTime(),AFTConstants.YYYYMMDD);
-			AdminUserCount selectAUC = getAdminUserCount(e.getAid(),startTime);
-			if (selectAUC==null){
-				adminUserCountMapper.insertSelective(e);
-			}else {
-				AdminUserCount newAUC=new AdminUserCount();
-				newAUC.setId(selectAUC.getId());
-				if (e.getPrivateCount()==null)selectAUC.setPrivateCount(0);
-				if (e.getChannelCount()==null)selectAUC.setChannelCount(0);
-				if (e.getSignCount()==null)selectAUC.setSignCount(0);
-				if (e.getOrderCount()==null)selectAUC.setOrderCount(0);
-				newAUC.setPrivateCount(e.getPrivateCount());
-				newAUC.setChannelCount(e.getChannelCount());
-				newAUC.setSignCount(e.getSignCount());
-				newAUC.setOrderCount(e.getOrderCount());
-				adminUserCountMapper.updateByPrimaryKeySelective(newAUC);
-			}
-		}
-	}
+
 
 
 	public void sendWeChat( String publicCarbonCopy,Integer id, String name, String startTime, String endTime, String typeName, String plan) {

+ 0 - 4
src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java

@@ -177,8 +177,6 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 				//所有客户转交给接受者
 				transferUserUpdateExamine(aid,transferId);
 				userMapper.updateDimissionTransfer(aid,transferId);
-				List<AdminUserCount> tramsferList = userMapper.selectListByaidAndDate(transferId);
-				asyncUtils.updateAdminUserCount(aid,tramsferList);
 			}else if (s==roleResources.QDYW.getCode()) {
 				userTransferLogMapper.insertUserLockLog(aid,transferId,date);
 				patentNewMapper.updateAdmin(aid,transferId);
@@ -189,8 +187,6 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 				tOrderLogMapper.insertOrderLog(aid,TokenManager.getAdminId(),date,str.toString());
 				tOrderNewMapper.updateSalesmanId(aid, transferId);
 				tOrderMidMapper.updateSalesmanId(aid, transferId);
-				List<AdminUserCount> tramsferList =adminMapper.selectAdminOrder(transferId);
-				asyncUtils.updateAdminUserOrderCount(tramsferList);
 			}else if (s == roleResources.XMRW.getCode()) {
 				// 获取被转角色判断修改对应任务角色
 				asyncUtils.pushTechTransfer(admin,tadmin,date);