Skip to content

Z
zhichan
Commit c15f5b7c by 宋毅
Options

修改请求

parent d0b73652
Showing with 43 additions and 43 deletions
zhiquanquan/app/base/controller/impl/trademark/searchCtl.js
...@@ -24,49 +24,49 @@ class searchCtl extends CtlBase { ...@@ -24,49 +24,49 @@ class searchCtl extends CtlBase {
* {"error": ""} * {"error": ""}
*/ */
async findAndCountAll(p, q, req) { async findAndCountAll(p, q, req) {
let query = { let query = {
"actionType": "", "actionType": "",
"actionBody": { "actionBody": {
pageSize: p.pageInfo.pageSize, pageSize: p.pageInfo.pageSize,
currentPage: p.pageInfo.pageNo, currentPage: p.pageInfo.pageNo,
"tmName": "",//商标名称 "tmName": "",//商标名称
"regMan": "", "regMan": "",
"regNum": "", "regNum": "",
"sqlbtabkey": "",//商标类别 "sqlbtabkey": "",//商标类别
"flzttabkey": "",//法律状态 "flzttabkey": "",//法律状态
"sqnftabkey": "",//申请年份 "sqnftabkey": "",//申请年份
"ncl": [],//尼斯大类 "ncl": [],//尼斯大类
"xcl": [],//尼斯群组 "xcl": [],//尼斯群组
"nclNum": [],//尼斯大类 "nclNum": [],//尼斯大类
} }
}; };
var tmurl=settings.channelApiUrl(); var tmurl = settings.channelApiUrl();
if (Object.keys(p.search).length > 0) { if (Object.keys(p.search).length > 0) {
if (p.search.sbzch) {//注册号查询 if (p.search.sbzch) {//注册号查询
// query.actionType = "findTrademarkzchAccurate"; // query.actionType = "findTrademarkzchAccurate";
tmurl=tmurl+"/api/trademark/tmqueryApi/findTrademarkzchAccurate"; tmurl = tmurl + "/api/trademark/tmqueryApi/findTrademarkzchAccurate";
query.actionBody.regNum = p.search.sbzch query.actionBody.regNum = p.search.sbzch
} else if (p.search.zcren) {//申请人查询 } else if (p.search.zcren) {//申请人查询
// query.actionType = "findTrademarkzcr"; // query.actionType = "findTrademarkzcr";
tmurl=tmurl+"/api/trademark/tmqueryApi/findTrademarkzcr"; tmurl = tmurl + "/api/trademark/tmqueryApi/findTrademarkzcr";
query.actionBody.regMan = p.search.zcren query.actionBody.regMan = p.search.zcren
} else if (p.search.sbmc) {//商标名称查询 } else if (p.search.sbmc) {//商标名称查询
// query.actionType = "findTrademarkNameAccurate"; // query.actionType = "findTrademarkNameAccurate";
tmurl=tmurl+"/api/trademark/tmqueryApi/findTrademarkNameAccurate"; tmurl = tmurl + "/api/trademark/tmqueryApi/findTrademarkNameAccurate";
query.actionBody.tmName = p.search.sbmc query.actionBody.tmName = p.search.sbmc
} }
} else{ } else {
console.log("===============search====search=======>"); console.log("===============search====search=======>");
return; return;
} }
// let tokenInfo = await this.service.getToken(); // let tokenInfo = await this.service.getToken();
// console.log("==========================>",tokenInfo) // console.log("==========================>",tokenInfo)
// console.log("==========================>",tokenInfo.data.token) // console.log("==========================>",tokenInfo.data.token)
try { try {
let rtn = await this.execClient.execPostTK(query, tmurl, ""); let rtn = await this.execClient.execPostTK(query.actionBody, tmurl, "");
console.log(rtn,"============rtn==============>"); console.log(rtn, "============rtn==============>");
let data = rtn.data; let data = rtn.data;
let published = await this.service.findAll({company_id: p.company_id}); let published = await this.service.findAll({ company_id: p.company_id });
data.rows.forEach(item => { data.rows.forEach(item => {
for (let t of published) { for (let t of published) {
if (t.tm_code == item.sbzch) if (t.tm_code == item.sbzch)
...@@ -74,8 +74,8 @@ class searchCtl extends CtlBase { ...@@ -74,8 +74,8 @@ class searchCtl extends CtlBase {
} }
}); });
return system.getResultList(data.count, data.rows) return system.getResultList(data.count, data.rows)
}catch (e) { } catch (e) {
console.log("=======================>",e) console.log("=======================>", e)
} }
} }
......
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