fix

zhiquanquan/app/base/controller/impl/trademark/trademarkCtl.js

@@ -31,8 +31,8 @@ class TrademarkCtl extends CtlBase {
             "actionType": "tmInfo",
             "actionBody": {
                 channel_code: p.company_id,
-                pageSize:p.pageInfo.pageSize,// 每页数量
-                pageNumber:p.pageInfo.pageNo,// 页
+                pageSize: p.pageInfo.pageSize,// 每页数量
+                pageNumber: p.pageInfo.pageNo,// 页
             }
         };
         if (p.search) {
@@ -46,10 +46,12 @@ class TrademarkCtl extends CtlBase {
                 query.actionBody.tm_start_day = p.search.tm_start_day;
             else if (p.search.tm_end_day)
                 query.actionBody.tm_end_day = p.search.tm_end_day;
+            else if (p.search.ids)
+                query.actionBody.tmList = p.search.ids;
         }
         let rtn = await this.execClient.execPost(query, tmurl);
         let data = JSON.parse(rtn.stdout);
-        return system.getResultList(data.totalCount, data.data)
+        return system.getResultList(data.totalCount, data.data||[])
     }
 
     /**
@@ -87,20 +89,26 @@ class TrademarkCtl extends CtlBase {
      */
     async publish(p, q, req) {
         let body = {
-            "tm": p
+            "actionType": "tmBatchUpload",
+            "actionBody": {
+                "tm": p
+            }
         };
-       let upload=await this.uploadSve.create({
-           total:p.length
-       });
-        body.upload_id = upload.id;
-        let rtn = await pushClient(body);
-        if (rtn.status == 1) {
+        let rtn = await this.execClient.execPost(body, tmurl);
+        let data = JSON.parse(rtn.stdout);
+        if (data.status == 1) {
+            let upload = await this.uploadSve.create({
+                total: p.length,
+                success: data.data.successCount || 0,
+                fail: p.length - data.data.successCount || 0,
+                status: 1
+            });
             let tradedb = [];
-            p.map(db => tradedb.push({
+            data.data.tm.map(db => tradedb.push({
                 opath: p.opath,
                 user_id: p.userid,
                 company_id: p.company_id,
-                // trademark_id: db.id,
+                trademark_id: db.id,
                 tm_code: db.code,
                 upload_id: upload.id
             }));
@@ -164,13 +172,13 @@ class TrademarkCtl extends CtlBase {
         let update = [];
         let upload_id = p.actionBody.messageBody.upload_id;
         let upload = await this.uploadSve.findOne({
-            id:upload_id
+            id: upload_id
         });
-        upload.success = p.actionBody.resultInfo.data.success || 0;
-        upload.fail=upload.total-p.actionBody.resultInfo.data.success || 0;
-        upload.status=1;
+        upload.success = p.actionBody.resultInfo.data.successCount || 0;
+        upload.fail = upload.total - p.actionBody.resultInfo.data.successCount || 0;
+        upload.status = 1;
         upload.save();
-        let tradedb = p.actionBody.resultInfo.data;
+        let tradedb = p.actionBody.resultInfo.data.tm;
         tradedb.map(db => update.push({
             trademark_id: db.id,
             tm_code: db.code
@@ -178,6 +186,10 @@ class TrademarkCtl extends CtlBase {
         let res = await this.service.dao.model.bulkCreate(tradedb, {updateOnDuplicate: ["tm_code"]});
         return system.getResult(res)
     }
+    async getidlist(p, q, req){
+        let list =  await  this.service.findAll({upload_id:p.upload_id});
+        return system.getResult(list)
+    }
 }
 
 module.exports = TrademarkCtl;