Merge branch 'center-order' of gitlab.gongsibao.com:jiangyong/zhichan into center-order

center-order/app/base/db/impl/dbneed/diagnosisDao.js

@@ -22,6 +22,7 @@ class diagnosisDao extends Dao {
         "publish_mobile",
         "publish_mobile",
         "publish_name",
         "publish_name",
         "diagnosis_result",
         "diagnosis_result",
+        "whether_company",
         "qualifications_pic",
         "qualifications_pic",
         "brand_pic",
         "brand_pic",
         "industry_pic"],
         "industry_pic"],
@@ -44,6 +45,7 @@ class diagnosisDao extends Dao {
         "publish_mobile",
         "publish_mobile",
         "main_class",
         "main_class",
         "corporate_type_name",
         "corporate_type_name",
+        "whether_company",
         "created_at",
         "created_at",
         "qualifications_pic",
         "qualifications_pic",
         "brand_pic",
         "brand_pic",

center-order/app/base/db/models/dbneed/diagnosisneedinfo.js

@@ -48,6 +48,7 @@ module.exports = (db, DataTypes) => {
     diagnosis_result_data: DataTypes.JSON, // 智能诊断结果返回值 人工目前没用到
     diagnosis_result_data: DataTypes.JSON, // 智能诊断结果返回值 人工目前没用到
     status_name: DataTypes.STRING,//状态 dcl/gtz/dqrfa/ygb/ywc
     status_name: DataTypes.STRING,//状态 dcl/gtz/dqrfa/ygb/ywc
     main_class: DataTypes.JSON,// 主营类目（一级分类-二级分类）
     main_class: DataTypes.JSON,// 主营类目（一级分类-二级分类）
+    whether_company: DataTypes.INTEGER,// 是否存在工商信息 20200817 lin 新增 
     qualifications_pic: DataTypes.JSON,// 基础资质json {}
     qualifications_pic: DataTypes.JSON,// 基础资质json {}
     brand_pic: DataTypes.JSON,// 品牌资质json {}
     brand_pic: DataTypes.JSON,// 品牌资质json {}
     industry_pic: DataTypes.JSON,// 行业资质json {}
     industry_pic: DataTypes.JSON,// 行业资质json {}

center-order/app/base/service/impl/dbneed/diagnosisSve.js

@@ -35,6 +35,7 @@ class DiagnosisService extends ServiceBase {
       diagnosis_result: "rgshz", // 创建订单时 人工审核中 前台用
       diagnosis_result: "rgshz", // 创建订单时 人工审核中 前台用
       status: "dcl", // 创建订单时 待处理 后台用
       status: "dcl", // 创建订单时 待处理 后台用
       main_class: actionBody.mainClass, // 运营后台-诊断详情-主营类目
       main_class: actionBody.mainClass, // 运营后台-诊断详情-主营类目
+      whether_company: actionBody.whetherCompany ? 1 : 0,
       qualifications_pic: actionBody.qualificationsPic,
       qualifications_pic: actionBody.qualificationsPic,
       brand_pic: actionBody.brandPic,
       brand_pic: actionBody.brandPic,
       industry_pic: actionBody.industryPic
       industry_pic: actionBody.industryPic
@@ -82,7 +83,10 @@ class DiagnosisService extends ServiceBase {
       where.status = actionBody.status
       where.status = actionBody.status
     }
     }
     if (actionBody.publishName) {
     if (actionBody.publishName) {
-      where.publish_name = { [this.db.Op.like]: `%${actionBody.publish_name}%` }
+      where.publish_name = { [this.db.Op.like]: `%${actionBody.publishName}%` }
+    }
+    if (actionBody.corporateName) {
+      where.corporate_name = { [this.db.Op.like]: `%${actionBody.corporateName}%` }
     }
     }
     if (actionBody.stdate && actionBody.endate) {
     if (actionBody.stdate && actionBody.endate) {
       where.updated_at = { [this.db.Op.between]: [actionBody.stdate, actionBody.endate] }
       where.updated_at = { [this.db.Op.between]: [actionBody.stdate, actionBody.endate] }
@@ -131,6 +135,7 @@ class DiagnosisService extends ServiceBase {
   async enterpriseInfo (pobj) {
   async enterpriseInfo (pobj) {
     let diagnosisResult = await this.dao.findOneOrderByCreateAt(pobj.userInfo.channel_userid)
     let diagnosisResult = await this.dao.findOneOrderByCreateAt(pobj.userInfo.channel_userid)
     if (diagnosisResult) {
     if (diagnosisResult) {
+      // 2020 0817 lin 新增注释 这里做判断的目的 因为diagnosis_result字段可能还包含rgshz（人工审核中）。所以返回前端要做下处理
       diagnosisResult.auth_result_name = "未认证"
       diagnosisResult.auth_result_name = "未认证"
       if (diagnosisResult.diagnosis_result == "tg") {
       if (diagnosisResult.diagnosis_result == "tg") {
         diagnosisResult.auth_result_name = "已认证"
         diagnosisResult.auth_result_name = "已认证"

center-order/app/base/service/impl/dbneed/opneedinfoSve.js

@@ -78,6 +78,7 @@ class NeedinfoService extends ServiceBase {
     if (actionBody.publishMobile) {
     if (actionBody.publishMobile) {
       sobj.search.publishMobile = actionBody.publishMobile
       sobj.search.publishMobile = actionBody.publishMobile
     }
     }
+    console.log(actionBody)
     if (actionBody.stdate && actionBody.endate) {
     if (actionBody.stdate && actionBody.endate) {
       sobj.search.updated_at = [actionBody.stdate, actionBody.endate]
       sobj.search.updated_at = [actionBody.stdate, actionBody.endate]
     }
     }