|
@@ -17,7 +17,8 @@ class PatentearlyService extends CrudService {
|
|
|
}
|
|
|
async query(query, { skip = 0, limit = 0 }) {
|
|
|
const newquery = await this.resetCode(query);
|
|
|
- const res = await this.model.find(newquery).skip(parseInt(skip)).limit(parseInt(limit)).sort({ 'meta.createdAt': -1 });
|
|
|
+ const res = await this.model.find(newquery).skip(parseInt(skip)).limit(parseInt(limit))
|
|
|
+ .sort({ 'meta.createdAt': -1 });
|
|
|
return res;
|
|
|
}
|
|
|
async count(query) {
|
|
@@ -33,13 +34,13 @@ class PatentearlyService extends CrudService {
|
|
|
let ids = [];
|
|
|
if (code) {
|
|
|
const plist = await this.personalModel.find({ code });
|
|
|
- ids = plist.map((i) => i._id);
|
|
|
+ ids = plist.map(i => i._id);
|
|
|
if (ids.length > 0) {
|
|
|
newquery.user_id = { $elemMatch: { $in: ids } };
|
|
|
delete newquery.code;
|
|
|
}
|
|
|
} else if (user_id) {
|
|
|
- newquery.user_id = { $elemMatch: { $in: [ObjectId(user_id)] } };
|
|
|
+ newquery.user_id = { $elemMatch: { $in: [ ObjectId(user_id) ] } };
|
|
|
}
|
|
|
|
|
|
return newquery;
|
|
@@ -49,9 +50,10 @@ class PatentearlyService extends CrudService {
|
|
|
assert(code, '缺少机构信息');
|
|
|
let pids = await this.personalModel.find({ code }, { _id: 1 });
|
|
|
if (pids.length <= 0) return { data: [], total: 0 };
|
|
|
- pids = pids.map((i) => i._id);
|
|
|
+ pids = pids.map(i => i._id);
|
|
|
const query = { user_id: { $elemMatch: { $in: pids } } };
|
|
|
- const data = await this.model.find(query).skip(parseInt(skip)).limit(parseInt(limit)).sort({ 'meta.createdAt': -1 });
|
|
|
+ const data = await this.model.find(query).skip(parseInt(skip)).limit(parseInt(limit))
|
|
|
+ .sort({ 'meta.createdAt': -1 });
|
|
|
const total = await this.model.count(query);
|
|
|
return { data, total };
|
|
|
}
|
|
@@ -85,9 +87,9 @@ class PatentearlyService extends CrudService {
|
|
|
total++;
|
|
|
const { inventor, name } = i;
|
|
|
// 2021-11-04 修改,因为inventor修改为发明人[Object],所以发明人需要处理成字符串
|
|
|
- const inventorNameString = inventor.map((i) => i.name).join(';');
|
|
|
+ const inventorNameString = inventor.map(i => i.name).join(';');
|
|
|
const content = `发明人 【${inventorNameString}】 的已授权专利 【${name}】 即将失效,避免专利失效过期,请用户及时查看消息并处理! `;
|
|
|
- const nobj = { ..._.omit(i, ['_id', 'id']), content, parent_id: i._id };
|
|
|
+ const nobj = { ..._.omit(i, [ '_id', 'id' ]), content, parent_id: i._id };
|
|
|
this.model.create(nobj);
|
|
|
// 2021-11-04添加 向 patentexamine 表中添加数据
|
|
|
const patentexamineArray = [];
|