|
|
@@ -15,6 +15,7 @@ import java.util.UUID;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
|
+import com.goafanti.customer.bo.*;
|
|
|
import org.apache.commons.beanutils.BeanUtils;
|
|
|
import org.apache.commons.beanutils.PropertyUtils;
|
|
|
import org.apache.ibatis.builder.BuilderException;
|
|
|
@@ -77,22 +78,6 @@ import com.goafanti.common.utils.StringUtils;
|
|
|
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.BusinessListBo;
|
|
|
-import com.goafanti.customer.bo.BussinessFollowBo;
|
|
|
-import com.goafanti.customer.bo.CustomerExcelBo;
|
|
|
-import com.goafanti.customer.bo.CustomerListIn;
|
|
|
-import com.goafanti.customer.bo.CustomerListOut;
|
|
|
-import com.goafanti.customer.bo.CustomerOrganizationDetailBo;
|
|
|
-import com.goafanti.customer.bo.CustomerPersonalDetailBo;
|
|
|
-import com.goafanti.customer.bo.CustomerSimpleBo;
|
|
|
-import com.goafanti.customer.bo.FollowBusinessBo;
|
|
|
-import com.goafanti.customer.bo.FollowListBo;
|
|
|
-import com.goafanti.customer.bo.InputChannelCounts;
|
|
|
-import com.goafanti.customer.bo.InputListChannel;
|
|
|
-import com.goafanti.customer.bo.LockingReleaseBo;
|
|
|
-import com.goafanti.customer.bo.StatisticBo;
|
|
|
-import com.goafanti.customer.bo.UserNamesListBo;
|
|
|
-import com.goafanti.customer.bo.transferListBo;
|
|
|
import com.goafanti.customer.service.CustomerService;
|
|
|
import com.goafanti.user.bo.OutUserChannel;
|
|
|
|
|
|
@@ -325,6 +310,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
params.put("sort", cli.getSort());
|
|
|
if (null != cli.getChannel())
|
|
|
params.put("channel", cli.getChannel());
|
|
|
+ if (null != cli.getBusinessScope())
|
|
|
+ params.put("businessScope", cli.getBusinessScope());
|
|
|
return params;
|
|
|
}
|
|
|
|
|
|
@@ -792,7 +779,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
/**
|
|
|
* 跟进更新用户中间表
|
|
|
*
|
|
|
- * @param ub
|
|
|
*/
|
|
|
private void followProject(String uid, int x) {
|
|
|
Date date = new Date();
|
|
|
@@ -1763,7 +1749,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
/**
|
|
|
* 处理需要释放
|
|
|
*
|
|
|
- * @param list
|
|
|
*/
|
|
|
@Override
|
|
|
public void updateReleaseLock(Date releaseTime) {
|
|
|
@@ -1803,7 +1788,9 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
cli.setType(AFTConstants.USER_TYPE_ORGANIZATION);
|
|
|
cli.setAid(TokenManager.getAdminId());
|
|
|
// cli.setAid("1");
|
|
|
- cli.setShareType(String.valueOf(AFTConstants.USER_SHARE_PRIVATE));
|
|
|
+ if (cli.getShareType()==null){
|
|
|
+ cli.setShareType(String.valueOf(AFTConstants.USER_SHARE_PRIVATE));
|
|
|
+ }
|
|
|
Map<String, Object> params = disposeParams(cli);
|
|
|
return (Pagination<CustomerListIn>) findPage("selectCustomerInformationList", "selectCustomerInformationCount",
|
|
|
params, pageNo, pageSize);
|
|
|
@@ -2220,6 +2207,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
return findPage("getUserByNameList", "getUserByNameCount", params, pageNo,pageSize);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
@Override
|
|
|
public int updateUserName(String uid, String userName) {
|
|
|
userNamesMapper.updateAddUserName(uid,userName);
|
|
|
@@ -2246,6 +2235,12 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
return list;
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public Pagination<OutUserMianProducts> mainProductsList(Integer pageNo,Integer pageSize) {
|
|
|
+ Map<String,Object> map =new HashMap<>();
|
|
|
+ map.put("aid",TokenManager.getAdminId());
|
|
|
+ return (Pagination<OutUserMianProducts>) findPage("findMainProductsList","findMainProductsCount",map,pageNo,pageSize);
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|