Commit 8efc034c by 徐高华

企微托管

parent 21a45516
......@@ -2,6 +2,8 @@ package com.gic.haoban.manage.web.controller;
import java.util.Date;
import com.gic.search.engine.api.constant.OperateEnum;
import com.gic.search.engine.api.filter.NewNodeAddUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -66,7 +68,7 @@ public class MemberController {
*/
@RequestMapping("member-count")
@ResponseBody
public RestResponse<Object> getMemberCount(String searchParams, @RequestParam(defaultValue="0")int type) {
public RestResponse<Object> getMemberCount(String searchParams, @RequestParam(defaultValue="0")int type , @RequestParam(defaultValue="0")int qywxFlag) {
if (StringUtils.isBlank(searchParams)) {
return RestResponse.successResult(0);
}
......@@ -83,6 +85,9 @@ public class MemberController {
if (!StringUtils.isBlank(searchParams)) {
searchJson = JSON.parseObject(searchParams);
}
if(qywxFlag==1) {
searchJson = NewNodeAddUtil.addNewNodeForAnd("qywxFlag", OperateEnum.OPERATE_EQ.getValue(), 0, searchJson);
}
DynamicSearchDTO search = new DynamicSearchDTO();
searchJson = this.storeService.parseSelectData(searchJson, enterpriseId, clerkId, new Date());
search.setSearchJson(searchJson);
......
......@@ -754,7 +754,7 @@ public class QywxOpenTaskController {
}
private int getMemberNum(String searchParams, int memberType) {
RestResponse<Object> resp = this.memberController.getMemberCount(searchParams, memberType);
RestResponse<Object> resp = this.memberController.getMemberCount(searchParams, memberType,1);
return Integer.valueOf(resp.getResult().toString());
}
......@@ -767,6 +767,10 @@ public class QywxOpenTaskController {
return RestResponse.successResult(ret);
}
/**
* 音频文件转mp3
* @return
*/
@RequestMapping("list-silk")
@com.gic.web.common.ano.IgnoreLogin
@IgnoreLogin
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment