feat: 调整活动日历查询条件

app/controller/editor.ts

@@ -4,7 +4,6 @@ import { v1 as uuidv1 } from 'uuid';
 import { PageHistory } from '../model/pageHistory';
 import * as path from 'path';
 const { api } = require(path.resolve('./config/apollo.json'));
-
 export default class EditorController extends Controller {
 
   public async login(ctx: Context) {
@@ -200,29 +199,40 @@ export default class EditorController extends Controller {
   
   public async getListForActivityCalendar(ctx: Context) {
     let { exposureTime } = ctx.request.body;
-    let exposureStartTime = exposureTime.replace(/-/g, '/').split(' ')[0] + ' 23:59:59'
-    let where = omitBy({
-      validStartTime: {
-        [ctx.model.Sequelize.Op.lte]: exposureStartTime
-      },
-      validEndTime: {
-        [ctx.model.Sequelize.Op.gte]: exposureTime
-      },
-      enable: 1,
-      isPublish: 1,
-      tenantId: '560761'
-    }, v => !v);
-    const { rows: data } = await ctx.model.PageInfo.findAndCountAll({
-      where,
-      order: [['updated_at', 'DESC']],
-      attributes: ['id', 'uuid', 'pageName', 'tenantId', 'validStartTime', 'validEndTime']
-    });
+    exposureTime = exposureTime.replace(/-/g, '/').split(' ')[0]
+    // let where:any = omitBy({
+    //   // validStartTime: {
+    //   //   [ctx.model.Sequelize.Op.lte]: exposureTime
+    //   // },
+    //   // validEndTime: {
+    //   //   [ctx.model.Sequelize.Op.gte]: exposureTime
+    //   // },
+    //   enable: 1,
+    //   isPublish: 1,
+    //   tenantId: '560761',
+    // }, v => !v);
+    // where[ctx.model.Sequelize.fn('validStartTime', '%Y/%m/%d')] = {
+    //   [ctx.model.Sequelize.Op.lte]: exposureTime
+    // }
+
+    // where[ctx.model.Sequelize.fn('validEndTime', '%Y/%m/%d')] = {
+    //   [ctx.model.Sequelize.Op.gte]: exposureTime
+    // }
+    // const { rows: data } = await ctx.model.PageInfo.findAndCountAll({
+    //   where,
+    //   order: [['updated_at', 'DESC']],
+    //   attributes: ['id', 'uuid', 'pageName', 'tenantId', 'validStartTime', 'validEndTime']
+    // });
+    const data = await ctx.model.query(
+      "SELECT `id`, `uuid`, `page_name` AS `pageName`, `tenant_id` AS `tenantId`, `validStartTime`, `validEndTime` FROM page_config_info WHERE DATE_FORMAT(`validStartTime`, '%Y/%m/%d') <= '2022/12/01' AND DATE_FORMAT(`validEndTime`, '%Y/%m/%d') >= '2022/12/01' AND `page_config_info`.`enable` = 1 AND `page_config_info`.`is_publish` = 1 AND `page_config_info`.`tenant_id` = '560761'", {
+        type: ctx.model.QueryTypes.SELECT
+      }
+    )
     const res = data.map(item => {
-      let dataValues = item.dataValues;
-      dataValues.url = `${api.h5Host}/activity/${item.uuid}?tenantId=${item.tenantId}&vccToken={token}&appChannel={appChannel}`;
-      dataValues.uuid && delete dataValues.uuid;
-      dataValues.tenantId && delete dataValues.tenantId;
-      return item.dataValues;
+      item.url = `${api.h5Host}/activity/${item.uuid}?tenantId=${item.tenantId}&vccToken={token}&appChannel={appChannel}`;
+      item.uuid && delete item.uuid;
+      item.tenantId && delete item.tenantId;
+      return item;
     })
     ctx.body = ctx.helper.ok(res);
   }