tmBatchUpload update

center-tmtransaction/app/base/api/impl/action/trademarktransaction.js

@@ -28,6 +28,9 @@ class ProductAPI extends APIBase {
             case "tmInfo": // 2020 0903 lin 新增 标原管理
                 opResult = await this.trademarkTransactionSve.tmInfo(pobj, pobj.actionBody);
                 break;
+            case "tmListInfo": // 2020 0903 lin 新增 标原管理
+                opResult = await this.trademarkTransactionSve.tmListInfo(pobj, pobj.actionBody);
+                break;
             case "tmDetail": // 2020 0903 lin 新增 标原详情
                 opResult = await this.trademarkTransactionSve.tmDetail(pobj, pobj.actionBody);
                 break;

center-tmtransaction/app/base/service/impl/tm/trademarktransactionSve.js

@@ -267,7 +267,8 @@ class TrademarktransactionService extends ServiceBase {
           "code": "商标号",
           "channel_name": "申请主体"
           "stdate":"2020-09-02 11:30:11",// 专用期限 需要同时传参
-		      "endate":"2020-09-02 11:35:11"
+          "endate":"2020-09-02 11:35:11",
+          "tmList":["175672","175673"]
       	}
       }
    * @apiSuccessExample {json} 成功示例:
@@ -340,6 +341,10 @@ class TrademarktransactionService extends ServiceBase {
       countObj["tm_start_day"] = { [this.db.Op.gte]: ab.stdate };
       countObj["tm_end_day"] = { [this.db.Op.lte]: ab.endate };
     }
+    if (ab.tmList) {// 申请主体
+      whereObj["id"] = { [this.db.Op.in]: ab.tmList };
+      countObj["id"] = { [this.db.Op.in]: ab.tmList };
+    }
     var count = await this.dao.findCount({ where: countObj });
     var list = await this.dao.model.findAll({
       where: whereObj,

center-tmtransaction/app/front/entry/public/apidoc/api_data.js

@@ -17,7 +17,7 @@ define({ "api": [
       "examples": [
         {
           "title": "成功示例:",
-          "content": "{\n            \"status\": 1,\n            \"message\": \"success\",\n            \"data\": [\n                {\n                    \"id\": 175625,\n                    \"code\": \"123123\",\n                    \"name\": \"商标名字\",//商标名称 这个是es真实的商标名字\n                    \"channel_code\": \"18\",\n                    \"channel_name\": \"ali\",\n                    \"excelName\": \"商标名字\",// 上传时的商标名\n                    \"tm_applier\": \"18\",\n                    \"ncl_one_code\": \"ali\",\n                    \"business_quoted_price\": \"123\",\n                    \"platform_quoted_price\": \"123\",\n                    \"pic_url\": \"123\",\n                    \"publish_status_name\": \"审核中\",\n                    \"publish_status\": \"audit\",\n                    \"tm_group\": \"123\",\n                    \"tm_service_item\": \"123\",\n                    \"tm_introduction\": \"123\",\n                    \"tm_start_day\": \"0122-12-31T15:54:17.000Z\",\n                    \"tm_end_day\": \"0122-12-31T15:54:17.000Z\",\n                    \"contacts\": \"13911391996\",\n                    \"mobile\": \"13911391996\",\n                    \"notes\": \"13911391996\",\n                    \"op_notes\": \"13911391996\",\n                    \"trademark_type_name\": \"普通商标\",\n                    \"trademark_type\": \"ordinary\",\n                    \"tm_regist_day\": \"123\",\n                    \"tm_ncl_third\": \"123\",\n                    \"created_at\": \"2020-09-03T08:43:35.602Z\",\n                    \"updated_at\": \"2020-09-03T08:43:35.602Z\",\n                    \"version\": 0\n                }\n            ],\n            \"requestId\": \"8e1f04d0-edc1-11ea-8143-5f78fb49f643\"\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            },\n            \"requestId\": \"a9fb7670-f27b-11ea-8a62-1d06e253dc40\"\n        }",
           "type": "json"
         }
       ]

center-tmtransaction/app/front/entry/public/apidoc/api_data.json

@@ -17,7 +17,7 @@
       "examples": [
         {
           "title": "成功示例:",
-          "content": "{\n            \"status\": 1,\n            \"message\": \"success\",\n            \"data\": [\n                {\n                    \"id\": 175625,\n                    \"code\": \"123123\",\n                    \"name\": \"商标名字\",//商标名称 这个是es真实的商标名字\n                    \"channel_code\": \"18\",\n                    \"channel_name\": \"ali\",\n                    \"excelName\": \"商标名字\",// 上传时的商标名\n                    \"tm_applier\": \"18\",\n                    \"ncl_one_code\": \"ali\",\n                    \"business_quoted_price\": \"123\",\n                    \"platform_quoted_price\": \"123\",\n                    \"pic_url\": \"123\",\n                    \"publish_status_name\": \"审核中\",\n                    \"publish_status\": \"audit\",\n                    \"tm_group\": \"123\",\n                    \"tm_service_item\": \"123\",\n                    \"tm_introduction\": \"123\",\n                    \"tm_start_day\": \"0122-12-31T15:54:17.000Z\",\n                    \"tm_end_day\": \"0122-12-31T15:54:17.000Z\",\n                    \"contacts\": \"13911391996\",\n                    \"mobile\": \"13911391996\",\n                    \"notes\": \"13911391996\",\n                    \"op_notes\": \"13911391996\",\n                    \"trademark_type_name\": \"普通商标\",\n                    \"trademark_type\": \"ordinary\",\n                    \"tm_regist_day\": \"123\",\n                    \"tm_ncl_third\": \"123\",\n                    \"created_at\": \"2020-09-03T08:43:35.602Z\",\n                    \"updated_at\": \"2020-09-03T08:43:35.602Z\",\n                    \"version\": 0\n                }\n            ],\n            \"requestId\": \"8e1f04d0-edc1-11ea-8143-5f78fb49f643\"\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            },\n            \"requestId\": \"a9fb7670-f27b-11ea-8a62-1d06e253dc40\"\n        }",
           "type": "json"
         }
       ]

center-tmtransaction/app/front/entry/public/apidoc/api_project.js

@@ -9,7 +9,7 @@ define({
   "apidoc": "0.3.0",
   "generator": {
     "name": "apidoc",
-    "time": "2020-09-07T11:10:17.032Z",
+    "time": "2020-09-09T09:09:34.947Z",
     "url": "https://apidocjs.com",
     "version": "0.25.0"
   }

center-tmtransaction/app/front/entry/public/apidoc/api_project.json

@@ -9,7 +9,7 @@
   "apidoc": "0.3.0",
   "generator": {
     "name": "apidoc",
-    "time": "2020-09-07T11:10:17.032Z",
+    "time": "2020-09-09T09:09:34.947Z",
     "url": "https://apidocjs.com",
     "version": "0.25.0"
   }