Commit e8e81916 authored by 徐光星's avatar 徐光星

feat: 调整查询活动日历接口的时间查询条件

parent 3944915c
...@@ -200,6 +200,7 @@ export default class EditorController extends Controller { ...@@ -200,6 +200,7 @@ export default class EditorController extends Controller {
public async getListForActivityCalendar(ctx: Context) { public async getListForActivityCalendar(ctx: Context) {
let { exposureTime } = ctx.request.body; let { exposureTime } = ctx.request.body;
exposureTime = exposureTime.replace(/-/g, '/').split(' ')[0] exposureTime = exposureTime.replace(/-/g, '/').split(' ')[0]
console.log(exposureTime);
// let where:any = omitBy({ // let where:any = omitBy({
// // validStartTime: { // // validStartTime: {
// // [ctx.model.Sequelize.Op.lte]: exposureTime // // [ctx.model.Sequelize.Op.lte]: exposureTime
...@@ -224,7 +225,7 @@ export default class EditorController extends Controller { ...@@ -224,7 +225,7 @@ export default class EditorController extends Controller {
// attributes: ['id', 'uuid', 'pageName', 'tenantId', 'validStartTime', 'validEndTime'] // attributes: ['id', 'uuid', 'pageName', 'tenantId', 'validStartTime', 'validEndTime']
// }); // });
const data = await ctx.model.query( 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'", { "SELECT `id`, `uuid`, `page_name` AS `pageName`, `tenant_id` AS `tenantId`, `validStartTime`, `validEndTime` FROM page_config_info WHERE DATE_FORMAT(`validStartTime`, '%Y/%m/%d') <= '"+ exposureTime +"' AND DATE_FORMAT(`validEndTime`, '%Y/%m/%d') >= '" + exposureTime + "' 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 type: ctx.model.QueryTypes.SELECT
} }
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment