fix: 年报推送

icp-deliver/app/base/service/impl/delivery/deliverSve.js

@@ -195,6 +195,14 @@ class DeliverService extends ServiceBase {
                         deliver_id: annualReportData.id
                         deliver_id: annualReportData.id
                     });
                     });
                 }
                 }
+                // 推送年报信息
+                await pushTx.pushChangeOrder(pushTx.TXSTATUS.WAITDECLARE, annualReportData.delivery_code, {
+                    annualReport: annualReportArry.map(item => {
+                        item.status = item.status === system.ANNUALREPORT.WAITDECLARE ? "待申报" : "已申报"
+                        return item
+                    })
+                })
+
             }
             }
         }
         }
         return this.db.transaction(async (t) => {
         return this.db.transaction(async (t) => {

icp-deliver/app/base/utils/totxClient.js

@@ -14,8 +14,8 @@ const TXSTATUS = {
     POSTING: "150",//证书已邮寄
     POSTING: "150",//证书已邮寄
     SUCCESS: "170",//服务已完成
     SUCCESS: "170",//服务已完成
     CLOSED: "190",//已关闭
     CLOSED: "190",//已关闭
-    WAITDECLARE: "200",//待申报
-    DECLARESUCCESS: "210",//申报成功
+    WAITDECLARE: "25",//待申报
+    DECLARESUCCESS: "26",//申报成功
 }
 }
 const porApi = axios.create({
 const porApi = axios.create({
     baseURL: settings.txurl(), // api 的 base_url
     baseURL: settings.txurl(), // api 的 base_url
@@ -124,11 +124,12 @@ const pushDeclareReport = async (annualReport, deliverData) => {
         if (item.id === annualReport.id) {
         if (item.id === annualReport.id) {
             item.updated_at = new Date();
             item.updated_at = new Date();
             item.file = annualReport.file;
             item.file = annualReport.file;
+            item.status = system.ANNUALREPORT.DECLARESUCCESS;
         }
         }
         item.status = item.status === system.ANNUALREPORT.WAITDECLARE ? "待申报" : "已申报"
         item.status = item.status === system.ANNUALREPORT.WAITDECLARE ? "待申报" : "已申报"
         return item
         return item
     })
     })
-    await pushChangeOrder(TXSTATUS.DECLARESUCCESS, deliverData.delivery_code, result)
+    await pushChangeOrder(TXSTATUS.DECLARESUCCESS, deliverData.delivery_code, { annualReport: result })
 }
 }