|
@@ -77,7 +77,8 @@ class PatentearlyService extends CrudService {
|
|
let total = 0;
|
|
let total = 0;
|
|
let data = await this.patentinfo.find({ term: '有效' }, { name: 1, inventor: 1, create_date: 1 }).skip(skip).limit(limit);
|
|
let data = await this.patentinfo.find({ term: '有效' }, { name: 1, inventor: 1, create_date: 1 }).skip(skip).limit(limit);
|
|
if (data.length > 0) data = JSON.parse(JSON.stringify(data));
|
|
if (data.length > 0) data = JSON.parse(JSON.stringify(data));
|
|
-
|
|
+
|
|
|
|
+ const limitMonth = 3;
|
|
for (const i of data) {
|
|
for (const i of data) {
|
|
const { create_date } = i;
|
|
const { create_date } = i;
|
|
|
|
|
|
@@ -88,13 +89,28 @@ class PatentearlyService extends CrudService {
|
|
const afterYear = moment(nowYear).add(1, 'year').format('YYYY');
|
|
const afterYear = moment(nowYear).add(1, 'year').format('YYYY');
|
|
|
|
|
|
const nowDate = afterYear + '-' + month;
|
|
const nowDate = afterYear + '-' + month;
|
|
- const start = moment(nowDate).subtract(3, 'months').format('YYYY-MM-DD');
|
|
+ const start = moment(nowDate).subtract(limitMonth, 'months').format('YYYY-MM-DD');
|
|
|
|
|
|
const end = afterYear + '-' + month;
|
|
const end = afterYear + '-' + month;
|
|
const r = moment().isBetween(start, end, null, '[]');
|
|
const r = moment().isBetween(start, end, null, '[]');
|
|
console.log(r);
|
|
console.log(r);
|
|
if (r) {
|
|
if (r) {
|
|
total++;
|
|
total++;
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ let dr = false;
|
|
|
|
+ if (moment().format('YYYY-MM-DD') === start || moment().format('YYYY-MM-DD') === end) {
|
|
|
|
+
|
|
|
|
+ dr = true;
|
|
|
|
+ } else {
|
|
|
|
+
|
|
|
|
+ const dur = 10;
|
|
|
|
+ const subDay = moment(end).diff(moment(), 'days');
|
|
|
|
+
|
|
|
|
+ dr = _.isInteger(_.floor(_.divide(subDay, dur)));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (!dr) continue;
|
|
const { inventor, name } = i;
|
|
const { inventor, name } = i;
|
|
|
|
|
|
const user_id = inventor.map(i => ObjectId(i.user_id));
|
|
const user_id = inventor.map(i => ObjectId(i.user_id));
|