1

app/controller/patent/.patentassess.js

@@ -1,6 +1,7 @@
 module.exports = {
   create: {
     requestBody: [
+      "admin_id",
       "user_id",
       "patent_id",
       "create_number",
@@ -25,6 +26,7 @@ module.exports = {
   update: {
     params: ["!id"],
     requestBody: [
+      "admin_id",
       "user_id",
       "patent_id",
       "create_number",
@@ -52,6 +54,7 @@ module.exports = {
   index: {
     parameters: {
       query: {
+        admin_id: "admin_id",
         user_id: "user_id",
         patent_id: "patent_id",
         create_number: "create_number",

app/model/patent/patentassess.js

@@ -5,6 +5,7 @@ const metaPlugin = require('naf-framework-mongoose/lib/model/meta-plugin');
 const { ObjectId } = require('mongoose').Types;
 // 价值评估表
 const patentassess = {
+  admin_id: { type: ObjectId }, // 管理员id
   user_id: { type: ObjectId }, // 用户id
   patent_id: { type: ObjectId }, // 专利id
   create_number: { type: String }, // 申请号
@@ -25,6 +26,7 @@ const patentassess = {
 };
 const schema = new Schema(patentassess, { toJSON: { virtuals: true } });
 schema.index({ id: 1 });
+schema.index({ admin_id: 1 });
 schema.index({ user_id: 1 });
 schema.index({ patent_id: 1 });
 schema.index({ create_number: 1 });

app/service/statistics/index.js

@@ -388,10 +388,10 @@ class IndexService extends CrudService {
     const unread = await patentExamine.count({ to: id, is_read: false });
     // 专利申请
     const papply = this.ctx.model.Patent.Patentapply;
-    const apply = await papply.count({ status: [ '0', '1', '-1', '-2' ], user_id: id });
+    const apply = await papply.count({ status: [ '0', '1', '-1', '2', '-2' ], user_id: id });
     // 查询检索
     const palysis = this.ctx.model.Patent.Patentanalysis;
-    const analysis = await palysis.count({ status: [ '0', '-1' ], user_id: id });
+    const analysis = await palysis.count({ status: [ '0', '1', '-1', '2' ], user_id: id });
     // 价值评估
     const paccess = this.ctx.model.Patent.Patentassess;
     const access = await paccess.count({ status: [ '0', '-1' ], user_id: id });