guhongwei 3 years ago
parent
commit
9755f892bc
3 changed files with 27 additions and 11 deletions
  1. 12 3
      app/controller/patent/.patenttrans.js
  2. 9 1
      app/model/patent/patenttrans.js
  3. 6 7
      app/router.js

+ 12 - 3
app/controller/patent/.patenttrans.js

@@ -16,6 +16,9 @@ module.exports = {
       "expect",
       "present",
       "condition",
+      "is_contract",
+      "contract",
+      "offine_contract",
       "status",
     ],
   },
@@ -41,6 +44,9 @@ module.exports = {
       "expect",
       "present",
       "condition",
+      "is_contract",
+      "contract",
+      "offine_contract",
       "status",
     ],
   },
@@ -53,6 +59,7 @@ module.exports = {
   index: {
     parameters: {
       query: {
+        user_id: "user_id",
         patent_id: "patent_id",
         create_number: "create_number",
         patent_name: "patent_name",
@@ -60,14 +67,16 @@ module.exports = {
         phone: "phone",
         email: "email",
         budget: "budget",
+        is_report: "is_report",
         type: "type",
         status: "status",
+        isdel:"isdel",
         "create_time@start": "create_time@start",
         "create_time@end": "create_time@end",
       },
-      // options: {
-      //   "meta.state": 0 // 默认条件
-      // },
+      options: {
+        isdel: "0", // 默认条件
+      },
     },
     service: "query",
     options: {

+ 9 - 1
app/model/patent/patenttrans.js

@@ -20,10 +20,17 @@ const patenttrans = {
   expect: { type: String }, // 预期目标
   present: { type: String }, // 需求现状
   condition: { type: String }, // 合作条件及要求
-  status: { type: String }, // 状态 0:未交易 1:已交易
+  is_contract: { type: String }, // 0:线下合同,1:线上合同
+  contract: { type: Object }, // 线上合同
+  offine_contract: { type: Array }, // 线下合同
+  record: { type: Array }, // 记录
+  status: { type: String }, // 状态
+  remark: { type: String },
+  isdel: { type: String, required: false, default: '0' }, // 0=>未删除;1=>已撤回
 };
 const schema = new Schema(patenttrans, { toJSON: { virtuals: true } });
 schema.index({ id: 1 });
+schema.index({ user_id: 1 });
 schema.index({ patent_id: 1 });
 schema.index({ create_number: 1 });
 schema.index({ patent_name: 1 });
@@ -34,6 +41,7 @@ schema.index({ budget: 1 });
 schema.index({ type: 1 });
 schema.index({ is_report: 1 });
 schema.index({ status: 1 });
+schema.index({ isdel: 1 });
 schema.index({ 'meta.createdAt': 1 });
 schema.plugin(metaPlugin);
 module.exports = app => {

+ 6 - 7
app/router.js

@@ -70,15 +70,14 @@ module.exports = app => {
   require('./router/kjzl/kjzl_expert_view')(app); // 科教之旅-专家视点
 
   // 专利运营
-  require('./router/patent/disclosure')(app); // 交底表
-  require('./router/patent/report')(app); // 评估报告
-  require('./router/patent/notice')(app); // 消息通知
-  require('./router/patent/sell')(app); // 交易
-  require('./router/patent/purchase')(app); // 求购
-  require('./router/patent/tradeorder')(app); // 交易订单
+  // require('./router/patent/disclosure')(app); // 交底表
+  // require('./router/patent/report')(app); // 评估报告
+  // require('./router/patent/notice')(app); // 消息通知
+  // require('./router/patent/sell')(app); // 交易
+  // require('./router/patent/purchase')(app); // 求购
+  // require('./router/patent/tradeorder')(app); // 交易订单
   // 2021-08-20-重定义
   // require('./router/patent/patentroom')(app); // 专利资讯服务房间表
-
   require('./router/patent/patentchat')(app); // 专利资讯服务聊天表
   require('./router/patent/patentexamine')(app); // 审核通知表
   require('./router/patent/patentnotice')(app); // 通知表