policy

center-order/app/base/service/impl/dbpolicy/policyinfoSve.js

@@ -110,11 +110,10 @@ class PolicyinfoService extends ServiceBase {
   }
   }
 
 
   async addPolicyByExcel(){
   async addPolicyByExcel(){
-    var workbook = xl.readFile("policy7.xlsx");
+    var workbook = xl.readFile("policy8.xls");
     const sheetNames = workbook.SheetNames; // 返回 ['sheet1', 'sheet2']
     const sheetNames = workbook.SheetNames; // 返回 ['sheet1', 'sheet2']
     const worksheet = workbook.Sheets[sheetNames[0]];
     const worksheet = workbook.Sheets[sheetNames[0]];
     var dataa =xl.utils.sheet_to_json(worksheet);
     var dataa =xl.utils.sheet_to_json(worksheet);
-   
     var arr = [];
     var arr = [];
     var that=this;
     var that=this;
     await this.db.transaction(async function (t) {
     await this.db.transaction(async function (t) {

center-order/app/base/service/impl/dbpolicy/policysubscribeSve.js

@@ -112,6 +112,8 @@ class PolicysubscribeService extends ServiceBase {
     if(!obj.policySubscribeId){
     if(!obj.policySubscribeId){
       return system.getResult(null, "policySubscribeId不能为空");
       return system.getResult(null, "policySubscribeId不能为空");
     }
     }
+    var currentPage = obj.currentPage || 1;
+    var pageSize = obj.pageSize || 100 ;
     var ps = await this.dao.model.findOne({
     var ps = await this.dao.model.findOne({
       where:{id:obj.policySubscribeId,openid:obj.openid},
       where:{id:obj.policySubscribeId,openid:obj.openid},
       raw:true
       raw:true
@@ -135,10 +137,27 @@ class PolicysubscribeService extends ServiceBase {
     }
     }
     var pis = await this.policyinfoDao.model.findAll({//获取该订阅下的政策数据
     var pis = await this.policyinfoDao.model.findAll({//获取该订阅下的政策数据
       where:whereObj,raw:true,attributes:attributes,
       where:whereObj,raw:true,attributes:attributes,
-      order:[["id", "DESC"]]
+      order:[["id", "DESC"]],
+      offset:(currentPage - 1) * pageSize,
+      limit:pageSize
+    });
+    if(!pis || pis.length<1){
+      delete whereObj["created_at"];
+      pis = await this.policyinfoDao.model.findAll({//获取该订阅下的政策数据
+        where:whereObj,raw:true,attributes:attributes,
+        order:[["id", "DESC"]],
+        offset:(currentPage - 1) * pageSize,
+        limit:pageSize
+      });
+    }
+    var picount = await this.policyinfoDao.model.findAll({//获取该订阅下的政策数据
+      where:whereObj,raw:true,attributes:["id"],
     });
     });
+    picount = picount.length;
+    var res = system.getResultSuccess(pis);
+    res.dataCount = picount;
     await this.dao.update({id:obj.policySubscribeId,releaseDate:new Date()});//修改订阅发布日期
     await this.dao.update({id:obj.policySubscribeId,releaseDate:new Date()});//修改订阅发布日期
-    return system.getResultSuccess(pis);
+    return res;
   }
   }
 
 
 }
 }