Merge remote-tracking branch 'origin/master'

app/controller/.claimneed.js

@@ -3,10 +3,10 @@ module.exports = {
       requestBody: [
         '!money',
         '!use',
-        '!mongey_min_rate',
-        '!mongey_max_rate',
-        '!claims_min_term',
-        '!claims_max_term',
+        'mongey_min_rate',
+        'mongey_max_rate',
+        'claims_min_term',
+        'claims_max_term',
         '!ensure_id',
         'project_status',
         'remarks',
@@ -26,10 +26,10 @@ module.exports = {
       requestBody: [
         '!money',
         '!use',
-        '!mongey_min_rate',
-        '!mongey_max_rate',
-        '!claims_min_term',
-        '!claims_max_term',
+        'mongey_min_rate',
+        'mongey_max_rate',
+        'claims_min_term',
+        'claims_max_term',
         '!ensure_id',
         'project_status',
         'remarks',

app/model/claimneed.js

@@ -10,10 +10,10 @@ const { Secret } = require('naf-framework-mongoose/lib/model/schema');
 const ClaimNeedSchema = {
   money: { type: Number, required: true, maxLength: 200 }, // 融资金额
   use: { type: String, required: true, maxLength: 100}, //融资用途
-  mongey_min_rate: { type: Number, required: true, maxLength: 200 }, // 期望利率范围（小）
-  mongey_max_rate: { type: Number, required: true, maxLength: 200 }, // 期望利率范围（大）
-  claims_min_term: { type: Number, required: true, maxLength: 500 }, // 期望融资期限（小）
-  claims_max_term: { type: Number, required: true, maxLength: 500 }, // 期望融资期限（大）
+  mongey_min_rate: { type: Number,  maxLength: 200 }, // 期望利率范围（小）
+  mongey_max_rate: { type: Number,  maxLength: 200 }, // 期望利率范围（大）
+  claims_min_term: { type: Number,  maxLength: 500 }, // 期望融资期限（小）
+  claims_max_term: { type: Number,  maxLength: 500 }, // 期望融资期限（大）
   ensure_id: { type: String, required: true, maxLength: 200 }, // 担保方式（应该是担保字典ID）
   project_status: { type: String}, // 项目情况
   remarks: { type: String}, // 备注

app/service/claimneed.js

@@ -424,7 +424,7 @@ class ClaimNeedService extends CrudService {
           foreignField: 'code',
           as: 'dictnew' } },
           { $unwind: '$dictnew' },
-         { $project: { jg_pro_id: {$toObjectId: '$jg_pro_id'},money:1,use:1,mongey_min_rate:1,mongey_max_rate:1,claims_min_term:1,claims_max_term:1,project_status:1,remarks:1,
+         { $project: { jg_pro_id: {$toObjectId: '$jg_pro_id'},money:1,use:1,mongey_min_rate:1,project_status:1,remarks:1,
                       hyname:'$dictnew.name',cdata:1,finuserid:'$userid',userid:{$toObjectId: '$userid'}} },
          { $lookup: {
            from: 't_finance_claims',
@@ -432,7 +432,7 @@ class ClaimNeedService extends CrudService {
            foreignField: '_id',
            as: 'jgpronew' } },
         { $unwind: '$jgpronew' },
-        { $project: { jg_pro_id:1,money:1,use:1,mongey_min_rate:1,mongey_max_rate:1,claims_min_term:1,claims_max_term:1,project_status:1,remarks:1,
+        { $project: { jg_pro_id:1,money:1,use:1,project_status:1,remarks:1,
           hyname:1,cdata:1,folid:{$toString:'$_id'},jgpronew:1,finuserid:1,userid:1}},
           { $lookup: {
            from: 'company_user',
@@ -452,7 +452,7 @@ class ClaimNeedService extends CrudService {
         foreignField: 'finceId',
         as: 'follownew' } },
         { $unwind: { path: '$follownew', preserveNullAndEmptyArrays: true } },
-        { $project: { jg_pro_id:1,money:1,use:1,mongey_min_rate:1,mongey_max_rate:1,claims_min_term:1,claims_max_term:1,project_status:1,remarks:1,
+        { $project: { jg_pro_id:1,money:1,use:1,project_status:1,remarks:1,
                   hyname:1,cdata:1,folid:{$toString:'$_id'},jgpronew:1,sxcplilue:'$follownew.sxcplilue',
                   sxcpname:'$follownew.sxcpname',sxhowlong:'$follownew.sxhowlong',credit_money:'$follownew.credit_money',
                   finuserid:1,userphone:'$cusernew.phone',usernnmae:'$cusernew.person',cotifynew:1}}