Skip to content

Z
zhichan
Commit 4c5b39c4 by linboxuan
Options

tmInfo update and tmBatchUpload update

parent 4dc17ce0
Showing with 30 additions and 11 deletions
center-tmtransaction/app/base/service/impl/tm/trademarktransactionSve.js
...@@ -203,7 +203,8 @@ class TrademarktransactionService extends ServiceBase { ...@@ -203,7 +203,8 @@ class TrademarktransactionService extends ServiceBase {
"version": 0 "version": 0
} }
], ],
"successCount": 1 "successCount": 1,// 成功个数
"failCount": 0// 失败个数
}, },
"requestId": "a9fb7670-f27b-11ea-8a62-1d06e253dc40" "requestId": "a9fb7670-f27b-11ea-8a62-1d06e253dc40"
} }
...@@ -225,26 +226,32 @@ class TrademarktransactionService extends ServiceBase { ...@@ -225,26 +226,32 @@ class TrademarktransactionService extends ServiceBase {
// 2020 0909 lin 新增功能 查询code是否存在如果价格 高于之前的code 就价格异常 // 2020 0909 lin 新增功能 查询code是否存在如果价格 高于之前的code 就价格异常
// count作为插入成功数量 // count作为插入成功数量
var count = 0; var count = 0;
var failCount = 0;
for (var i = 0; i < objlist.length; i++) { for (var i = 0; i < objlist.length; i++) {
// 2020 0914 lin 新增 以下校验，校验规则为上传模版的5个字段 // 2020 0914 lin 新增 以下校验，校验规则为上传模版的5个字段
if(!objlist[i].excelName) { if(!objlist[i].excelName) {
objlist[i]["publish_status"] = "fail" objlist[i]["publish_status"] = "fail"
failCount++;
continue; continue;
} }
if(!objlist[i].code) { if(!objlist[i].code) {
objlist[i]["publish_status"] = "fail" objlist[i]["publish_status"] = "fail"
failCount++;
continue; continue;
} }
if(!objlist[i].business_quoted_price) { if(!objlist[i].business_quoted_price) {
objlist[i]["publish_status"] = "fail" objlist[i]["publish_status"] = "fail"
failCount++;
continue; continue;
} }
if(!objlist[i].contacts) { if(!objlist[i].contacts) {
objlist[i]["publish_status"] = "fail" objlist[i]["publish_status"] = "fail"
failCount++;
continue; continue;
} }
if(!objlist[i].mobile) { if(!objlist[i].mobile) {
objlist[i]["publish_status"] = "fail" objlist[i]["publish_status"] = "fail"
failCount++;
continue; continue;
} }
var tmInfo = await this.dao.model.findOne({ var tmInfo = await this.dao.model.findOne({
...@@ -263,6 +270,7 @@ class TrademarktransactionService extends ServiceBase { ...@@ -263,6 +270,7 @@ class TrademarktransactionService extends ServiceBase {
if (tmInfo) { if (tmInfo) {
if (tmInfo.business_quoted_price < objlist[i].business_quoted_price) { if (tmInfo.business_quoted_price < objlist[i].business_quoted_price) {
objlist[i]["publish_status"] = "fail" objlist[i]["publish_status"] = "fail"
failCount++;
continue; continue;
} }
} }
...@@ -273,7 +281,8 @@ class TrademarktransactionService extends ServiceBase { ...@@ -273,7 +281,8 @@ class TrademarktransactionService extends ServiceBase {
let res = await this.dao.model.bulkCreate(objlist); let res = await this.dao.model.bulkCreate(objlist);
var data = { var data = {
tm: res, tm: res,
successCount: count successCount: count,
failCount: failCount
} }
return system.getResultSuccess(data); return system.getResultSuccess(data);
} }
...@@ -291,9 +300,11 @@ class TrademarktransactionService extends ServiceBase { ...@@ -291,9 +300,11 @@ class TrademarktransactionService extends ServiceBase {
"excelName": "商标名字",// 商标名字 注意这里 name修改为execlName "excelName": "商标名字",// 商标名字 注意这里 name修改为execlName
"code": "商标号", "code": "商标号",
"channel_name": "申请主体" "channel_name": "申请主体"
"tm_applier":"申请主体"// 注意这里 申请主体由channel_name改为 tm_applier，但channel_name没有删除 以防以后会用
"stdate":"2020-09-02 11:30:11",// 专用期限 需要同时传参 "stdate":"2020-09-02 11:30:11",// 专用期限 需要同时传参
"endate":"2020-09-02 11:35:11", "endate":"2020-09-02 11:35:11",
"tmList":["175672","175673"] "tmList":["175672","175673"],
"publish_status":"fail" // 发布状态
} }
} }
* @apiSuccessExample {json} 成功示例: * @apiSuccessExample {json} 成功示例:
...@@ -369,7 +380,11 @@ class TrademarktransactionService extends ServiceBase { ...@@ -369,7 +380,11 @@ class TrademarktransactionService extends ServiceBase {
whereObj["code"] = { [this.db.Op.like]: "%" + ab.code + "%" }; whereObj["code"] = { [this.db.Op.like]: "%" + ab.code + "%" };
countObj["code"] = { [this.db.Op.like]: "%" + ab.code + "%" }; countObj["code"] = { [this.db.Op.like]: "%" + ab.code + "%" };
} }
if (ab.channel_name) {// 申请主体 if (ab.tm_applier) {// 申请主体 2020 0917 lin 修改 查询条件改为tm_applier。但前端的条件字段为channel_name
whereObj["tm_applier"] = { [this.db.Op.like]: "%" + ab.tm_applier + "%" };
countObj["tm_applier"] = { [this.db.Op.like]: "%" + ab.tm_applier + "%" };
}
if (ab.channel_name) {// 申请主体 2020 0917 lin 新增
whereObj["channel_name"] = { [this.db.Op.like]: "%" + ab.channel_name + "%" }; whereObj["channel_name"] = { [this.db.Op.like]: "%" + ab.channel_name + "%" };
countObj["channel_name"] = { [this.db.Op.like]: "%" + ab.channel_name + "%" }; countObj["channel_name"] = { [this.db.Op.like]: "%" + ab.channel_name + "%" };
} }
...@@ -381,10 +396,14 @@ class TrademarktransactionService extends ServiceBase { ...@@ -381,10 +396,14 @@ class TrademarktransactionService extends ServiceBase {
countObj["tm_start_day"] = { [this.db.Op.gte]: ab.tm_start_day }; countObj["tm_start_day"] = { [this.db.Op.gte]: ab.tm_start_day };
countObj["tm_end_day"] = { [this.db.Op.lte]: ab.tm_end_day }; countObj["tm_end_day"] = { [this.db.Op.lte]: ab.tm_end_day };
} }
if (ab.tmList) {// 申请主体 if (ab.tmList) {// 根据数组查询
whereObj["id"] = { [this.db.Op.in]: ab.tmList }; whereObj["id"] = { [this.db.Op.in]: ab.tmList };
countObj["id"] = { [this.db.Op.in]: ab.tmList }; countObj["id"] = { [this.db.Op.in]: ab.tmList };
} }
if (ab.publish_status) {// publish_status
whereObj["publish_status"] = ab.publish_status;
countObj["publish_status"] = ab.publish_status;
}
var count = await this.dao.findCount({ where: countObj }); var count = await this.dao.findCount({ where: countObj });
var list = await this.dao.model.findAll({ var list = await this.dao.model.findAll({
where: whereObj, where: whereObj,
......
center-tmtransaction/app/front/entry/public/apidoc/api_data.js
...@@ -17,7 +17,7 @@ define({ "api": [ ...@@ -17,7 +17,7 @@ define({ "api": [
"examples": [ "examples": [
{ {
"title": "成功示例:", "title": "成功示例:",
"content": "{\n \"status\": 1,\n \"message\": \"success\",\n \"data\": {\n \"tm\": [\n {\n \"id\": 175706,\n \"code\": \"224262441\",\n \"name\": \"阿里\",\n \"channel_code\": 10,\n \"channel_name\": \"公司宝\",\n \"tm_applier\": \"公司宝\",\n \"ncl_one_code\": \"31\",\n \"business_quoted_price\": \"12341\",\n \"pic_url\": null,\n \"publish_status\": \"audit\",\n \"tm_service_item\": \"\",\n \"tm_start_day\": null,\n \"tm_end_day\": null,\n \"contacts\": \"1234\",\n \"mobile\": \"1324\",\n \"trademark_type_name\": \"普通商标\",\n \"trademark_type\": \"ordinary\",\n \"tm_regist_day\": \"\",\n \"created_at\": \"2020-09-09T09:05:53.482Z\",\n \"updated_at\": \"2020-09-09T09:05:53.482Z\",\n \"version\": 0\n }\n ],\n \"successCount\": 1\n },\n \"requestId\": \"a9fb7670-f27b-11ea-8a62-1d06e253dc40\"\n }", "content": "{\n \"status\": 1,\n \"message\": \"success\",\n \"data\": {\n \"tm\": [\n {\n \"id\": 175706,\n \"code\": \"224262441\",\n \"name\": \"阿里\",\n \"channel_code\": 10,\n \"channel_name\": \"公司宝\",\n \"tm_applier\": \"公司宝\",\n \"ncl_one_code\": \"31\",\n \"business_quoted_price\": \"12341\",\n \"pic_url\": null,\n \"publish_status\": \"audit\",\n \"tm_service_item\": \"\",\n \"tm_start_day\": null,\n \"tm_end_day\": null,\n \"contacts\": \"1234\",\n \"mobile\": \"1324\",\n \"trademark_type_name\": \"普通商标\",\n \"trademark_type\": \"ordinary\",\n \"tm_regist_day\": \"\",\n \"created_at\": \"2020-09-09T09:05:53.482Z\",\n \"updated_at\": \"2020-09-09T09:05:53.482Z\",\n \"version\": 0\n }\n ],\n \"successCount\": 1,// 成功个数\n \"failCount\": 0// 失败个数\n },\n \"requestId\": \"a9fb7670-f27b-11ea-8a62-1d06e253dc40\"\n }",
"type": "json" "type": "json"
} }
] ]
...@@ -45,7 +45,7 @@ define({ "api": [ ...@@ -45,7 +45,7 @@ define({ "api": [
"examples": [ "examples": [
{ {
"title": "请求参数", "title": "请求参数",
"content": "{\n \t\"actionType\": \"tmInfo\",\n \t\"actionBody\": {\n \"channel_code\": \"18\"// 必填 渠道码 从中台权限获取到\n \"pageSize\":10,// 每页数量\n \"pageNumber\":4,// 页\n \"excelName\": \"商标名字\",// 商标名字 注意这里 name修改为execlName\n \"code\": \"商标号\",\n \"channel_name\": \"申请主体\"\n \"stdate\":\"2020-09-02 11:30:11\",// 专用期限 需要同时传参\n \"endate\":\"2020-09-02 11:35:11\",\n \"tmList\":[\"175672\",\"175673\"]\n \t}\n }", "content": "{\n \t\"actionType\": \"tmInfo\",\n \t\"actionBody\": {\n \"channel_code\": \"18\"// 必填 渠道码 从中台权限获取到\n \"pageSize\":10,// 每页数量\n \"pageNumber\":4,// 页\n \"excelName\": \"商标名字\",// 商标名字 注意这里 name修改为execlName\n \"code\": \"商标号\",\n \"channel_name\": \"申请主体\"\n \"tm_applier\":\"申请主体\"// 注意这里 申请主体由channel_name改为 tm_applier，但channel_name没有删除 以防以后会用\n \"stdate\":\"2020-09-02 11:30:11\",// 专用期限 需要同时传参\n \"endate\":\"2020-09-02 11:35:11\",\n \"tmList\":[\"175672\",\"175673\"],\n \"publish_status\":\"fail\" // 发布状态\n \t}\n }",
"type": "json" "type": "json"
} }
] ]
......
center-tmtransaction/app/front/entry/public/apidoc/api_data.json
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
"examples": [ "examples": [
{ {
"title": "成功示例:", "title": "成功示例:",
"content": "{\n \"status\": 1,\n \"message\": \"success\",\n \"data\": {\n \"tm\": [\n {\n \"id\": 175706,\n \"code\": \"224262441\",\n \"name\": \"阿里\",\n \"channel_code\": 10,\n \"channel_name\": \"公司宝\",\n \"tm_applier\": \"公司宝\",\n \"ncl_one_code\": \"31\",\n \"business_quoted_price\": \"12341\",\n \"pic_url\": null,\n \"publish_status\": \"audit\",\n \"tm_service_item\": \"\",\n \"tm_start_day\": null,\n \"tm_end_day\": null,\n \"contacts\": \"1234\",\n \"mobile\": \"1324\",\n \"trademark_type_name\": \"普通商标\",\n \"trademark_type\": \"ordinary\",\n \"tm_regist_day\": \"\",\n \"created_at\": \"2020-09-09T09:05:53.482Z\",\n \"updated_at\": \"2020-09-09T09:05:53.482Z\",\n \"version\": 0\n }\n ],\n \"successCount\": 1\n },\n \"requestId\": \"a9fb7670-f27b-11ea-8a62-1d06e253dc40\"\n }", "content": "{\n \"status\": 1,\n \"message\": \"success\",\n \"data\": {\n \"tm\": [\n {\n \"id\": 175706,\n \"code\": \"224262441\",\n \"name\": \"阿里\",\n \"channel_code\": 10,\n \"channel_name\": \"公司宝\",\n \"tm_applier\": \"公司宝\",\n \"ncl_one_code\": \"31\",\n \"business_quoted_price\": \"12341\",\n \"pic_url\": null,\n \"publish_status\": \"audit\",\n \"tm_service_item\": \"\",\n \"tm_start_day\": null,\n \"tm_end_day\": null,\n \"contacts\": \"1234\",\n \"mobile\": \"1324\",\n \"trademark_type_name\": \"普通商标\",\n \"trademark_type\": \"ordinary\",\n \"tm_regist_day\": \"\",\n \"created_at\": \"2020-09-09T09:05:53.482Z\",\n \"updated_at\": \"2020-09-09T09:05:53.482Z\",\n \"version\": 0\n }\n ],\n \"successCount\": 1,// 成功个数\n \"failCount\": 0// 失败个数\n },\n \"requestId\": \"a9fb7670-f27b-11ea-8a62-1d06e253dc40\"\n }",
"type": "json" "type": "json"
} }
] ]
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
"examples": [ "examples": [
{ {
"title": "请求参数", "title": "请求参数",
"content": "{\n \t\"actionType\": \"tmInfo\",\n \t\"actionBody\": {\n \"channel_code\": \"18\"// 必填 渠道码 从中台权限获取到\n \"pageSize\":10,// 每页数量\n \"pageNumber\":4,// 页\n \"excelName\": \"商标名字\",// 商标名字 注意这里 name修改为execlName\n \"code\": \"商标号\",\n \"channel_name\": \"申请主体\"\n \"stdate\":\"2020-09-02 11:30:11\",// 专用期限 需要同时传参\n \"endate\":\"2020-09-02 11:35:11\",\n \"tmList\":[\"175672\",\"175673\"]\n \t}\n }", "content": "{\n \t\"actionType\": \"tmInfo\",\n \t\"actionBody\": {\n \"channel_code\": \"18\"// 必填 渠道码 从中台权限获取到\n \"pageSize\":10,// 每页数量\n \"pageNumber\":4,// 页\n \"excelName\": \"商标名字\",// 商标名字 注意这里 name修改为execlName\n \"code\": \"商标号\",\n \"channel_name\": \"申请主体\"\n \"tm_applier\":\"申请主体\"// 注意这里 申请主体由channel_name改为 tm_applier，但channel_name没有删除 以防以后会用\n \"stdate\":\"2020-09-02 11:30:11\",// 专用期限 需要同时传参\n \"endate\":\"2020-09-02 11:35:11\",\n \"tmList\":[\"175672\",\"175673\"],\n \"publish_status\":\"fail\" // 发布状态\n \t}\n }",
"type": "json" "type": "json"
} }
] ]
......
center-tmtransaction/app/front/entry/public/apidoc/api_project.js
...@@ -9,7 +9,7 @@ define({ ...@@ -9,7 +9,7 @@ define({
"apidoc": "0.3.0", "apidoc": "0.3.0",
"generator": { "generator": {
"name": "apidoc", "name": "apidoc",
"time": "2020-09-17T07:37:28.228Z", "time": "2020-09-17T10:54:03.508Z",
"url": "https://apidocjs.com", "url": "https://apidocjs.com",
"version": "0.25.0" "version": "0.25.0"
} }
......
center-tmtransaction/app/front/entry/public/apidoc/api_project.json
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"apidoc": "0.3.0", "apidoc": "0.3.0",
"generator": { "generator": {
"name": "apidoc", "name": "apidoc",
"time": "2020-09-17T07:37:28.228Z", "time": "2020-09-17T10:54:03.508Z",
"url": "https://apidocjs.com", "url": "https://apidocjs.com",
"version": "0.25.0" "version": "0.25.0"
} }
......
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