|
|
@@ -185,7 +185,6 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
}
|
|
|
/**
|
|
|
* 私有单位客户导出xls
|
|
|
- * @throws IOException
|
|
|
*/
|
|
|
@RequestMapping(value = "/privateUnitCustomerOutXls" , method = RequestMethod.GET)
|
|
|
public Result privateUnitCustomerOutXls(CustomerListIn cli ,Integer sort,Integer sortType,Integer pageNo, Integer pageSize,HttpServletResponse response) throws IOException{
|
|
|
@@ -306,9 +305,6 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
* 客户查询
|
|
|
* @param name 查询名称
|
|
|
* @param type 分类 0默认 1小程序App
|
|
|
- * @param pageNo
|
|
|
- * @param pageSize
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/getUserByNames",method = RequestMethod.GET)
|
|
|
public Result getUserByName(String name,Integer type,Integer pageNo,Integer pageSize){
|
|
|
@@ -325,7 +321,6 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
|
|
|
|
|
|
/** 添加客户基本信息
|
|
|
- *
|
|
|
* **/
|
|
|
@RequestMapping(value = "/addCustomer", method = RequestMethod.POST)
|
|
|
public Result addCustomer(InputAddCustomer in) {
|
|
|
@@ -531,7 +526,7 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
for (int idx = 0; idx < ja.size(); idx++) {
|
|
|
userBusiness = ja.getJSONObject(idx).toJavaObject(BusinessListBo.class);
|
|
|
for(BusinessListBo ub:list){
|
|
|
- if(ub.getBusinessProjectId() == userBusiness.getBusinessProjectId()){
|
|
|
+ if(Objects.equals(ub.getBusinessProjectId(), userBusiness.getBusinessProjectId())){
|
|
|
res.getError().add(new com.goafanti.common.bo.Error("业务类型重复,请检查后重新提交!"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -648,7 +643,6 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
* 领取客户
|
|
|
* @param uid 客户编号
|
|
|
* @param oldAid 原来的客户归属人
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/receiveCustomer", method = RequestMethod.GET)
|
|
|
public Result receiveCustomer(String uid, String oldAid) {
|
|
|
@@ -685,8 +679,6 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
|
|
|
/**
|
|
|
* 领取为渠道
|
|
|
- * @param uid
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/receiveAsChannel",method=RequestMethod.POST)
|
|
|
public Result receiveAsChannel(String uid){
|
|
|
@@ -701,8 +693,6 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
|
|
|
/**
|
|
|
* 上传excel文档
|
|
|
- * @param req
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/uploadExcel",method = RequestMethod.POST)
|
|
|
public Result uploadExcel(HttpServletRequest req){
|
|
|
@@ -722,12 +712,12 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
Set<Integer> existRows = new TreeSet<Integer>(); //数据库已存在
|
|
|
Set<Integer> filterRows = new TreeSet<Integer>(); //过滤提示
|
|
|
customerService.checkCustomer(boSet,existRows,filterRows);
|
|
|
- if(existRows.size()>0){
|
|
|
+ if(!existRows.isEmpty()){
|
|
|
errorMessage = StringUtils.join(existRows.toArray(),",")+ " 行客户业务已存在;";
|
|
|
res.getError().add(new Error(errorMessage));
|
|
|
return res;
|
|
|
}
|
|
|
- if(filterRows.size()>0){
|
|
|
+ if(!filterRows.isEmpty()){
|
|
|
errorMessage = StringUtils.join(filterRows.toArray(),",")+ " 行已经被系统过滤;";
|
|
|
res.getError().add(new Error(errorMessage));
|
|
|
return res;
|
|
|
@@ -770,9 +760,6 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
|
|
|
/**
|
|
|
* 转为公共客户 释放客户
|
|
|
- * @param uid
|
|
|
- * @param aid
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/transferToPublic", method = RequestMethod.GET)
|
|
|
public Result transferToPublic(String uid,String aid){
|
|
|
@@ -800,8 +787,6 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
* @param depNo 部门编号
|
|
|
* @param pageNo 页码
|
|
|
* @param pageSize 页数
|
|
|
- * @return
|
|
|
- * @throws ParseException
|
|
|
*/
|
|
|
@RequestMapping(value = "/customerStatistics",method = RequestMethod.GET)
|
|
|
public Result customerStatistics(String startDate,String endDate,String timeSpan,String depNo,String businessGlossoryId,Integer pageNo, Integer pageSize) throws ParseException{
|
|
|
@@ -813,17 +798,23 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
if(StringUtils.isNotBlank(endDate)) eDate = format.parse(endDate);
|
|
|
if(StringUtils.isBlank(startDate)&&StringUtils.isBlank(endDate)){
|
|
|
Date date = new Date();
|
|
|
- if(timeSpan.equals(DateUtils.DAY_SPAN)){
|
|
|
- sDate = DateUtils.getYesterday();
|
|
|
- }else if(timeSpan.equals(DateUtils.WEEK_SPAN)){
|
|
|
- sDate = DateUtils.getLastDayOfLastWeek(date);
|
|
|
- }else if(timeSpan.equals(DateUtils.MONTH_SPAN)){
|
|
|
- sDate = DateUtils.getLastDayOfLastMonth(date);
|
|
|
- }else if(timeSpan.equals(DateUtils.QUARTER_SPAN)){
|
|
|
- sDate = DateUtils.getLastDayOfLastQuarter(date);
|
|
|
- }else if(timeSpan.equals(DateUtils.YEAR_SPAN)){
|
|
|
- sDate = DateUtils.getLastDayOfLastYear(date);
|
|
|
- }
|
|
|
+ switch (timeSpan) {
|
|
|
+ case DateUtils.DAY_SPAN:
|
|
|
+ sDate = DateUtils.getYesterday();
|
|
|
+ break;
|
|
|
+ case DateUtils.WEEK_SPAN:
|
|
|
+ sDate = DateUtils.getLastDayOfLastWeek(date);
|
|
|
+ break;
|
|
|
+ case DateUtils.MONTH_SPAN:
|
|
|
+ sDate = DateUtils.getLastDayOfLastMonth(date);
|
|
|
+ break;
|
|
|
+ case DateUtils.QUARTER_SPAN:
|
|
|
+ sDate = DateUtils.getLastDayOfLastQuarter(date);
|
|
|
+ break;
|
|
|
+ case DateUtils.YEAR_SPAN:
|
|
|
+ sDate = DateUtils.getLastDayOfLastYear(date);
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
res.setData(customerService.customerStatistics(sDate,eDate,depNo,businessGlossoryId,pageNo,pageSize));
|
|
|
return res;
|
|
|
@@ -838,8 +829,6 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
* @param businessGlossoryId 业务编号
|
|
|
* @param pageNo 页码
|
|
|
* @param pageSize 页数
|
|
|
- * @return
|
|
|
- * @throws ParseException
|
|
|
*/
|
|
|
@RequestMapping(value = "/businessStatistic", method = RequestMethod.GET)
|
|
|
public Result businessStatistic(String startDate,String endDate,String timeSpan,String depNo,String businessGlossoryId,Integer pageNo, Integer pageSize) throws ParseException{
|
|
|
@@ -851,17 +840,23 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
if(StringUtils.isNotBlank(endDate)) eDate = format.parse(endDate);
|
|
|
if(StringUtils.isBlank(startDate)&&StringUtils.isBlank(endDate)){
|
|
|
Date date = new Date();
|
|
|
- if(timeSpan.equals(DateUtils.DAY_SPAN)){
|
|
|
- sDate = DateUtils.getYesterday();
|
|
|
- }else if(timeSpan.equals(DateUtils.WEEK_SPAN)){
|
|
|
- sDate = DateUtils.getLastDayOfLastWeek(date);
|
|
|
- }else if(timeSpan.equals(DateUtils.MONTH_SPAN)){
|
|
|
- sDate = DateUtils.getLastDayOfLastMonth(date);
|
|
|
- }else if(timeSpan.equals(DateUtils.QUARTER_SPAN)){
|
|
|
- sDate = DateUtils.getLastDayOfLastQuarter(date);
|
|
|
- }else if(timeSpan.equals(DateUtils.YEAR_SPAN)){
|
|
|
- sDate = DateUtils.getLastDayOfLastYear(date);
|
|
|
- }
|
|
|
+ switch (timeSpan) {
|
|
|
+ case DateUtils.DAY_SPAN:
|
|
|
+ sDate = DateUtils.getYesterday();
|
|
|
+ break;
|
|
|
+ case DateUtils.WEEK_SPAN:
|
|
|
+ sDate = DateUtils.getLastDayOfLastWeek(date);
|
|
|
+ break;
|
|
|
+ case DateUtils.MONTH_SPAN:
|
|
|
+ sDate = DateUtils.getLastDayOfLastMonth(date);
|
|
|
+ break;
|
|
|
+ case DateUtils.QUARTER_SPAN:
|
|
|
+ sDate = DateUtils.getLastDayOfLastQuarter(date);
|
|
|
+ break;
|
|
|
+ case DateUtils.YEAR_SPAN:
|
|
|
+ sDate = DateUtils.getLastDayOfLastYear(date);
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
res.setData(customerService.businessStatistic(sDate,eDate,depNo,businessGlossoryId,pageNo,pageSize));
|
|
|
return res;
|
|
|
@@ -875,8 +870,6 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
* @param depNo 部门编号
|
|
|
* @param pageNo 页码
|
|
|
* @param pageSize 页数
|
|
|
- * @return
|
|
|
- * @throws ParseException
|
|
|
*/
|
|
|
|
|
|
@RequestMapping(value = "/followStatistic",method = RequestMethod.GET)
|
|
|
@@ -889,17 +882,23 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
if(StringUtils.isNotBlank(endDate)) eDate = format.parse(endDate);
|
|
|
if(StringUtils.isBlank(startDate)&&StringUtils.isBlank(endDate)){
|
|
|
Date date = new Date();
|
|
|
- if(timeSpan.equals(DateUtils.DAY_SPAN)){
|
|
|
- sDate = DateUtils.getYesterday();
|
|
|
- }else if(timeSpan.equals(DateUtils.WEEK_SPAN)){
|
|
|
- sDate = DateUtils.getLastDayOfLastWeek(date);
|
|
|
- }else if(timeSpan.equals(DateUtils.MONTH_SPAN)){
|
|
|
- sDate = DateUtils.getLastDayOfLastMonth(date);
|
|
|
- }else if(timeSpan.equals(DateUtils.QUARTER_SPAN)){
|
|
|
- sDate = DateUtils.getLastDayOfLastQuarter(date);
|
|
|
- }else if(timeSpan.equals(DateUtils.YEAR_SPAN)){
|
|
|
- sDate = DateUtils.getLastDayOfLastYear(date);
|
|
|
- }
|
|
|
+ switch (timeSpan) {
|
|
|
+ case DateUtils.DAY_SPAN:
|
|
|
+ sDate = DateUtils.getYesterday();
|
|
|
+ break;
|
|
|
+ case DateUtils.WEEK_SPAN:
|
|
|
+ sDate = DateUtils.getLastDayOfLastWeek(date);
|
|
|
+ break;
|
|
|
+ case DateUtils.MONTH_SPAN:
|
|
|
+ sDate = DateUtils.getLastDayOfLastMonth(date);
|
|
|
+ break;
|
|
|
+ case DateUtils.QUARTER_SPAN:
|
|
|
+ sDate = DateUtils.getLastDayOfLastQuarter(date);
|
|
|
+ break;
|
|
|
+ case DateUtils.YEAR_SPAN:
|
|
|
+ sDate = DateUtils.getLastDayOfLastYear(date);
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
res.setData(customerService.followStatistic(sDate, eDate, depNo, pageNo, pageSize));
|
|
|
return res;
|
|
|
@@ -909,7 +908,6 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
* 管理员列表
|
|
|
* @param adminName 名称
|
|
|
* @param status 0 正常 1锁定 2全部
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/listAdminByName",method = RequestMethod.GET)
|
|
|
public Result listAdminByName(String adminName,Integer status){
|
|
|
@@ -922,11 +920,8 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
/**
|
|
|
* 客户转交 私有客户转交,签单客户转交
|
|
|
* @param uid 用户编号
|
|
|
- * @param aid
|
|
|
* @param operatorType 3私有 4签单
|
|
|
- * @param oldAid
|
|
|
* @param data 资料同步转移 0无 1资料转交 2订单转交 3全部转交
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/transferToOther", method = RequestMethod.GET)
|
|
|
public Result transferToOther(String uid,String aid,Integer operatorType,Integer data,String oldAid){
|
|
|
@@ -938,7 +933,7 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
//默认为私有转交,4为签单转交
|
|
|
if (operatorType==null) operatorType=AFTConstants.USER_TRANSFER_TO_OTHER;
|
|
|
//转交,对方不是客服营销员才需要判断最大限制
|
|
|
- if (operatorType ==AFTConstants.USER_TRANSFER_TO_OTHER&&(!customerService.checkAid(aid,Integer.valueOf(AFTConstants.CUSTOMER_SERVICE_SALESMAN)))){
|
|
|
+ if (operatorType.equals(AFTConstants.USER_TRANSFER_TO_OTHER) &&(!customerService.checkAid(aid,Integer.valueOf(AFTConstants.CUSTOMER_SERVICE_SALESMAN)))){
|
|
|
if (customerService.checkMax(uid,aid)){
|
|
|
res.getError().add(buildError("","对方私有客户已达最大限制"));
|
|
|
return res;
|
|
|
@@ -953,7 +948,6 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
/**
|
|
|
* 客户转交记录
|
|
|
* @param uid 客户编号
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/transferList", method = RequestMethod.GET)
|
|
|
public Result transferList(String uid){
|
|
|
@@ -1323,12 +1317,9 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
/**
|
|
|
* 企业项目申报材料上传
|
|
|
*
|
|
|
- * @param req
|
|
|
- * @param uid
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/upload", method = RequestMethod.POST)
|
|
|
- public Result cognizanceFile(HttpServletRequest req, String uid, String id, String sign) {
|
|
|
+ public Result cognizanceFile(HttpServletRequest req, String uid, String sign) {
|
|
|
Result res = new Result();
|
|
|
AttachmentType attachmentType = AttachmentType.getField(sign);
|
|
|
if (attachmentType == AttachmentType.ORGANIZATION_APPLICATION) {
|
|
|
@@ -1341,10 +1332,7 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
/**
|
|
|
* 企业项目申报材料预览授权
|
|
|
*
|
|
|
- * @param id
|
|
|
- * @param sign
|
|
|
- * @return
|
|
|
- */
|
|
|
+ */
|
|
|
@RequestMapping(value = "/techProject", method = RequestMethod.GET)
|
|
|
public Result previewTechProject(String id, String sign) {
|
|
|
Result res = new Result();
|
|
|
@@ -1364,12 +1352,6 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
}
|
|
|
/**
|
|
|
* 查看营销员客户统计
|
|
|
- * @param depId
|
|
|
- * @param startTime
|
|
|
- * @param endTime
|
|
|
- * @param pageSize
|
|
|
- * @param pageNo
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/selectAdminCustomerStatistics", method = RequestMethod.GET)
|
|
|
public Result selectAdminCustomerstatistics(String depId, String startTime,String endTime, Integer pageSize, Integer pageNo) {
|
|
|
@@ -1383,7 +1365,6 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
* @param depId 部门编号
|
|
|
* @param startTime 开始时间
|
|
|
* @param endTime 结束时间
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/selectAllUser", method = RequestMethod.GET)
|
|
|
public Result selectAllUser(String depId, String startTime,String endTime,String aName ) {
|
|
|
@@ -1398,7 +1379,6 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
* @param depId 部门编号
|
|
|
* @param startTime 开始时间
|
|
|
* @param endTime 结束时间
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/selectAllUser/export", method = RequestMethod.GET)
|
|
|
public Result selectAllUserExport(String depId, String startTime,String endTime,String aName ) {
|
|
|
@@ -1421,7 +1401,6 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
* @param inputId 业务转移客户id(接收者)
|
|
|
* @param uid 被转移的客户
|
|
|
* @param pid 呗转移的业务
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/privateBusinessTransfer", method = RequestMethod.POST)
|
|
|
public Result privateBusinessTransfer(String inputId,String uid,String pid ) {
|
|
|
@@ -1464,7 +1443,6 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
* @param receiveId 接受者
|
|
|
* @param remarks 备注
|
|
|
* @param type 0 分配 1转交 2回退
|
|
|
- * @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/channelCustomerDeliver", method = RequestMethod.POST)
|
|
|
public Result channelCustomerDeliver(String userIds ,String receiveId,String remarks,Integer type){
|
|
|
@@ -1496,10 +1474,8 @@ public class AdminCustomerApiController extends BaseApiController{
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR,null,"uid或者名称"));
|
|
|
return res;
|
|
|
}
|
|
|
- if (userName!=null){
|
|
|
- userName=userName.trim();
|
|
|
- }
|
|
|
- if(customerService.checkUserName(uid,userName)){
|
|
|
+ userName = userName.trim();
|
|
|
+ if(customerService.checkUserName(uid,userName)){
|
|
|
res.getError().add(buildError(ErrorConstants.CUSTOMER_ALREADY_EXIST,null,"["+userName+"]"));
|
|
|
return res;
|
|
|
}
|