guhongwei 3 years ago
parent
commit
4db7c89401

+ 22 - 2
app/controller/patent/.patentassess.js

@@ -4,9 +4,17 @@ module.exports = {
       "user_id",
       "admin_id",
       "patent_id",
+      "create_number",
       "patent_name",
+      "inventor",
+      "type",
+      "contact",
+      "phone",
+      "email",
+      "abstract",
+      "field",
+      "explain",
       "is_money",
-      "expert",
       "report",
       "status",
     ],
@@ -21,10 +29,19 @@ module.exports = {
       "user_id",
       "admin_id",
       "patent_id",
+      "create_number",
       "patent_name",
+      "inventor",
+      "type",
+      "contact",
+      "phone",
+      "email",
+      "abstract",
+      "field",
+      "explain",
       "is_money",
-      "expert",
       "report",
+      "record",
       "status",
     ],
   },
@@ -40,7 +57,10 @@ module.exports = {
         user_id: "user_id",
         admin_id: "admin_id",
         patent_id: "patent_id",
+        create_number: "create_number",
         patent_name: "patent_name",
+        type: "type",
+        status:"status",
         is_money: "is_money",
       },
       // options: {

+ 11 - 1
app/model/patent/patentassess.js

@@ -8,9 +8,17 @@ const patentassess = {
   user_id: { type: ObjectId }, // 用户id
   admin_id: { type: ObjectId }, // 管理员id
   patent_id: { type: ObjectId }, // 专利id
+  create_number: { type: String }, // 申请号
   patent_name: { type: String }, // 专利名称
+  inventor: { type: Array }, // 发明人
+  type: { type: String, required: false }, // 专利类型
+  contact: { type: Array }, // 联系人
+  phone: { type: String }, // 联系人电话
+  email: { type: String }, // 联系人邮箱
+  abstract: { type: String, required: false }, // 摘要
+  field: { type: String, required: false }, // 应用领域
+  explain: { type: String, required: false }, // 技术说明
   is_money: { type: Boolean, default: false }, // 是否缴费
-  expert: { type: Array }, // 专家
   report: { type: Array }, // 评估报告
   record: { type: Array }, // 记录
   status: { type: String, default: '0' }, // 状态
@@ -21,6 +29,8 @@ schema.index({ id: 1 });
 schema.index({ user_id: 1 });
 schema.index({ admin_id: 1 });
 schema.index({ patent_id: 1 });
+schema.index({ create_number: 1 });
+schema.index({ type: 1 });
 schema.index({ is_money: 1 });
 schema.index({ 'meta.createdAt': 1 });
 schema.plugin(metaPlugin);

+ 1 - 1
app/service/patent/patentanalysis.js

@@ -90,7 +90,7 @@ class PatentanalysisService extends CrudService {
         to = user_id;
         break;
       case '1':
-        content = `您的专利申请书【${name}】已通过管理员的审核,请您耐心等待管理员审核`;
+        content = `您的专利申请书【${name}】已通过管理员的审核,请您耐心等待管理员发放报告文件`;
         to = user_id;
         break;
       default:

+ 1 - 1
app/service/patent/patentapply.js

@@ -40,7 +40,7 @@ class PatentapplyService extends CrudService {
         word = '修改';
         break;
       case '1':
-        word = '机构审核';
+        word = '机构审核通过';
         break;
       case '-1':
         word = '机构审核未通过';

+ 6 - 2
app/service/patent/patentassess.js

@@ -88,11 +88,15 @@ class PatentassessService extends CrudService {
         }
         break;
       case '-1':
-        content = `您提交的价值评估【${patent_name}】未通过管理员的审核,请您及时修改,重新申请`;
+        content = `您提交的价值评估【${patent_name}】未通过管理员的审核,请您及时修改,重新申请`;
         to = user_id;
         break;
       case '1':
-        content = `您的提交的价值评估【${patent_name}】通过了管理员的审核,系统管理员会在3-5个工作日发出价值评估报告,以供用户下载`;
+        content = `您提交的价值评估【${patent_name}】通过了管理员的审核,系统管理员会在3-5个工作日发出价值评估报告,以供用户下载`;
+        to = user_id;
+        break;
+      case '2':
+        content = `您提交的价值评估【${patent_name}】系统管理员已发放报告文件,请及时查看并下载`;
         to = user_id;
         break;
       default: