policy

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

@@ -78,17 +78,34 @@ class PolicysubscribeService extends ServiceBase {
     }
     paramObj["openid"] = obj.openid;
     var resList = await this.dao.model.findAll({
-      attributes:["id","policyProvince","policyTypes","created_at"],
+      attributes:["id","policyProvince","policyTypes","created_at","releaseDate"],
       where:paramObj,raw:true,
       order:[["id", "DESC"]]
     });
+    for(var i=0;i<resList.length;i++){
+      var ps = resList[i];
+      var whereObj = {uapp_id:app.uapp_id};
+      if(ps.policyProvince && ps.policyProvince !="全国"){
+        whereObj["policyProvince"] = ps.policyProvince;
+      }
+      if(ps.policyTypes){
+        var types = ps.policyTypes.split(",");
+        whereObj["policyType"] = { [this.db.Op.in]: types};
+      }
+      if(ps.releaseDate){
+        whereObj["created_at"] = { [this.db.Op.gte]: ps.releaseDate};
+      }
+      var pis = await this.policyinfoDao.model.findAll({
+        where:whereObj,raw:true,attributes:["id"]
+      });
+      ps.dataCount = pis?pis.length:0;
+    }
     return system.getResultSuccess(resList);
   }
   //政策订阅检索列表
   async policySubscribeQuery(pobj){
     var app = pobj.appInfo;
     var obj = pobj.actionBody;
-    var paramObj={uapp_id:app.uapp_id};
     if(!obj.openid){
       return system.getResult(null, "openid不能为空");
     }
@@ -103,20 +120,24 @@ class PolicysubscribeService extends ServiceBase {
       return system.getResult(null, "订阅信息不存在");
     }
     //{ where: { id: { [this.db.Op.in]: ids } } }
-    var whereObj = {};
+    var whereObj = {uapp_id:app.uapp_id};
     var attributes =["id","policyType","policyTypeName","policyDate","policyCity","policyProvince",
     "policyLinkUrl","policySource","policyName","policyNo"];
-    if(ps.policyProvince){
+    if(ps.policyProvince  && ps.policyProvince !="全国"){
       whereObj["policyProvince"] = ps.policyProvince;
     }
     if(ps.policyTypes){
       var types = ps.policyTypes.split(",");
       whereObj["policyType"] = { [this.db.Op.in]: types};
     }
-    var pis = await this.policyinfoDao.model.findAll({
+    if(ps.releaseDate){
+      whereObj["created_at"] = { [this.db.Op.gte]: ps.releaseDate};
+    }
+    var pis = await this.policyinfoDao.model.findAll({//获取该订阅下的政策数据
       where:whereObj,raw:true,attributes:attributes,
       order:[["id", "DESC"]]
     });
+    await this.dao.update({id:obj.policySubscribeId,releaseDate:new Date()});//修改订阅发布日期
     return system.getResultSuccess(pis);
   }