Authored by 邱骏

listNoUser 增加limitDate参数

@@ -178,6 +178,7 @@ const article = { @@ -178,6 +178,7 @@ const article = {
178 const order = ((query.order || 'desc') + '').toLowerCase(); 178 const order = ((query.order || 'desc') + '').toLowerCase();
179 const orderByFields = ['createTime', 'goodCount']; 179 const orderByFields = ['createTime', 'goodCount'];
180 const dateTime = query.dateTime || ''; 180 const dateTime = query.dateTime || '';
  181 + const limitDate = query.limitDate || '';
181 182
182 if (!actId) { 183 if (!actId) {
183 return res.json({ 184 return res.json({
@@ -206,7 +207,8 @@ const article = { @@ -206,7 +207,8 @@ const article = {
206 orderBy, 207 orderBy,
207 pageNo, 208 pageNo,
208 pageSize, 209 pageSize,
209 - dateTime 210 + dateTime,
  211 + limitDate
210 }) 212 })
211 .then(result => { 213 .then(result => {
212 let list = []; 214 let list = [];
@@ -59,13 +59,14 @@ class ArticleModel extends global.yoho.BaseModel { @@ -59,13 +59,14 @@ class ArticleModel extends global.yoho.BaseModel {
59 * 获取文章无用户 59 * 获取文章无用户
60 * @returns {*} 60 * @returns {*}
61 */ 61 */
62 - articleListWithoutUser({actId, pageNo, pageSize, orderBy, order, dateTime}) { 62 + articleListWithoutUser({actId, pageNo, pageSize, orderBy, order, dateTime, limitDate}) {
63 const orderMapping = { 63 const orderMapping = {
64 goodCount: 'good_count', 64 goodCount: 'good_count',
65 createTime: 'create_time' 65 createTime: 'create_time'
66 }; 66 };
67 67
68 const date = dateTime || ''; 68 const date = dateTime || '';
  69 + const limit_date = limitDate || '';
69 70
70 let limitSql; 71 let limitSql;
71 let orderSql; 72 let orderSql;
@@ -75,6 +76,9 @@ class ArticleModel extends global.yoho.BaseModel { @@ -75,6 +76,9 @@ class ArticleModel extends global.yoho.BaseModel {
75 if (date !== '') { 76 if (date !== '') {
76 whereSql += ' AND to_days(AA.create_time) = to_days(\'' + date + '\')'; 77 whereSql += ' AND to_days(AA.create_time) = to_days(\'' + date + '\')';
77 } 78 }
  79 + if (limit_date !== '') {
  80 + whereSql += ' AND to_days(AA.create_time) <= to_days(\'' + limit_date + '\')';
  81 + }
78 orderSql = `ORDER BY AA.${orderMapping[orderBy]} ${order}`; 82 orderSql = `ORDER BY AA.${orderMapping[orderBy]} ${order}`;
79 limitSql = 'LIMIT :start, :page'; 83 limitSql = 'LIMIT :start, :page';
80 84