init dn

e1413933 · wkliang · 3e04b04f · e1413933 · e1413933 · e1413933
Commit e1413933 authored Aug 11, 2020 by wkliang
9 changed files
--- a/center-order/app/base/db/impl/askfor/askforDao.js
+++ b/center-order/app/base/db/impl/askfor/askforDao.js
@@ -7,7 +7,7 @@ class AskForDao extends Dao {
  async getByUid (uid, page = 1, offset = 11) {
    return await this.model.findAndCountAll({
      where: { user_id: uid, a_type: 1 },
-      limit: 11,
+      limit: offset,
      offset: (page - 1) * offset
    })
  }

--- a/center-order/app/base/db/impl/askfor/collectDao.js
+++ b/center-order/app/base/db/impl/askfor/collectDao.js
@@ -7,7 +7,7 @@ class CollectDao extends Dao {
  async getByUid (uid, page = 1, offset = 9) {
    return await this.model.findAndCountAll({
      where: { user_id: uid, c_type: 1 },
-      limit: 9,
+      limit: offset,
      offset: (page - 1) * offset
    })
  }

--- a/center-order/app/base/db/impl/dbneed/diagnosisneedinfoDao.js
+++ b/center-order/app/base/db/impl/dbneed/diagnosisneedinfoDao.js
+const Dao = require("../../dao.base");
+class diagnosisneedinfoDao extends Dao {
+  constructor() {
+    super(Dao.getModelName(diagnosisneedinfoDao));
+  }
+}
+module.exports = diagnosisneedinfoDao;
\ No newline at end of file
--- a/center-order/app/base/db/impl/dbneed/diagnosisneedsolutionDao.js
+++ b/center-order/app/base/db/impl/dbneed/diagnosisneedsolutionDao.js
+const Dao = require("../../dao.base");
+class diagnosisneedsolutionDao extends Dao {
+  constructor() {
+    super(Dao.getModelName(diagnosisneedsolutionDao));
+  }
+}
+module.exports = diagnosisneedsolutionDao;
\ No newline at end of file
--- a/center-order/app/base/db/metadata/apps/platform.js
+++ b/center-order/app/base/db/metadata/apps/platform.js
@@ -73,9 +73,18 @@ module.exports = {
            "push_chance_type": { "wts": "未推送", "yts": "已推送", "ygj": "已跟进", "ycd": "已成单", "ygb": "已关闭" },
            "policy_type": { 'fzbt': '租金减免', 'jrdk': '金融贷款', 'zdfc': '行政措施', 'ssjm': '税收优惠', 'rlzy': '人力资源' },
            "customer_intention": { "dgj": "待跟进", "yyx": "有意向", "wyx": "无意向" },
-            "solution_status": { "dqr": "待确认","ybh":"用户驳回", "ywc": "已完成", "yzf": "已作废" },
+            "solution_status": { "dqr": "待确认", "ybh": "用户驳回", "ywc": "已完成", "yzf": "已作废" },
            // 2020 0811 lin 新增 资质诊断 诊断单枚举
-            "corporate_type": {"qjd":"旗舰店","zmd":"专卖店"}
+            // 店铺类型
+            "corporate_type": { "qjd": "旗舰店", "zmd": "专卖店", "zyd": "专营店", "qy": "企业", "gtgsh": "个体工商户", "mbfqy": "民办非企业", "flfw": "法律服务" },
+            // 诊断类型
+            "diagnosis_type": { "zb": "直播", "ds": "电商" },
+            // 诊断方式
+            "diagnosis_mode": { "zn": "智能评估", "rg": "人工评估" },
+            // 诊断结果
+            "diagnosis_result": { "tg": "通过", "wtg": "未通过", "rgshz": "人工审核中" },
+            // 诊断处理状态
+            "diagnosis_status": { "dcl": "待处理", "gtz": "沟通中", "dqrfa": "待确认方案", "ygb": "已关闭", "ywc": "已完成" }
        },
    }
 }
\ No newline at end of file
--- a/center-order/app/base/db/models/dbneed/diagnosisneedinfo.js
+++ b/center-order/app/base/db/models/dbneed/diagnosisneedinfo.js
@@ -9,27 +9,54 @@ module.exports = (db, DataTypes) => {
    corporateNname: DataTypes.INTEGER,//公司名称
    publishName: DataTypes.STRING,//联系人名字
    publishMobile: DataTypes.STRING(50),//联系人手机号
-    corporateType: DataTypes.STRING,//店铺类型 电商诊断：qjd/zmd/zyd，直播诊断：qy/gtgsh/mbfqy/flfw
+    corporateType: { //店铺类型 电商诊断：qjd/zmd/zyd，直播诊断：qy/gtgsh/mbfqy/flfw
+      type: DataTypes.ENUM,
+      values: Object.keys(uiconfig.config.pdict.corporate_type),
+      set: function (val) {
+        this.setDataValue("corporateType", val);
+        this.setDataValue("corporateTypeName", uiconfig.config.pdict.corporate_type[val]);
+      }
+    },
    corporateTypeName: DataTypes.STRING,//店铺类型名字 电商诊断：旗舰店/专卖店/专营店，直播诊断：企业/个体工商户/民办非企业/法律服务 --暂不用
-    diagnosisType: DataTypes.INTEGER,//诊断类型 zb/ds
+    diagnosisType: { //诊断类型 zb/ds
+      type: DataTypes.ENUM,
+      values: Object.keys(uiconfig.config.pdict.diagnosis_type),
+      set: function (val) {
+        this.setDataValue("diagnosisType", val);
+        this.setDataValue("diagnosisTypeName", uiconfig.config.pdict.diagnosis_type[val]);
+      }
+    },
    diagnosisTypeName: DataTypes.STRING,//诊断类型名字 直播/电商 --暂不用
-    diagnosisMode: DataTypes.STRING,//诊断方式 zn/rg
+    diagnosisMode: { //诊断方式 zn/rg
+      type: DataTypes.ENUM,
+      values: Object.keys(uiconfig.config.pdict.diagnosis_mode),
+      set: function (val) {
+        this.setDataValue("diagnosisMode", val);
+        this.setDataValue("diagnosisModeName", uiconfig.config.pdict.diagnosis_mode[val]);
+      }
+    },
    diagnosisModeName: DataTypes.STRING(50),//诊断方式名字 智能评估/人工评估 --暂不用'
-    diagnosisResult: DataTypes.STRING,//诊断结果 tg/wtg/rgshz
+    diagnosisResult: { //诊断结果 tg/wtg/rgshz
+      type: DataTypes.ENUM,
+      values: Object.keys(uiconfig.config.pdict.diagnosis_result),
+      set: function (val) {
+        this.setDataValue("diagnosisResult", val);
+        this.setDataValue("diagnosisResultName", uiconfig.config.pdict.diagnosis_result[val]);
+      }
+    },
    diagnosisResultName: DataTypes.STRING,//诊断结果名字 通过/未通过/人工审核中 --暂不用
-    status: DataTypes.STRING,//状态 后台用 dcl/gtz/dqrfa/ygb/ywc
    statusName: DataTypes.STRING,//状态 dcl/gtz/dqrfa/ygb/ywc
    qualificationsPic: DataTypes.JSON,// 基础资质json {}
    brandPic: DataTypes.JSON,// 品牌资质json {}
    industryPic: DataTypes.JSON,// 行业资质json {}
    notes: DataTypes.STRING,//备注
-    status: {
+    status: { //状态 后台用 dcl/gtz/dqrfa/ygb/ywc
      //wts未推送,yts已推送,ygj已跟进,ycd已成单
      type: DataTypes.ENUM,
-      values: Object.keys(uiconfig.config.pdict.push_chance_type),
+      values: Object.keys(uiconfig.config.pdict.diagnosis_status),
      set: function (val) {
        this.setDataValue("status", val);
-        this.setDataValue("statusName", uiconfig.config.pdict.push_chance_type[val]);
+        this.setDataValue("statusName", uiconfig.config.pdict.diagnosis_status[val]);
      }
    },
  }, {

--- a/center-order/app/base/db/models/dbneed/diagnosisneedsolution.js
+++ b/center-order/app/base/db/models/dbneed/diagnosisneedsolution.js
+/* jshint indent: 2 */
+module.exports = function(sequelize, DataTypes) {
+  return sequelize.define('diagnosisneedsolution', {
+    diagnosisNo: DataTypes.STRING,
+    solutionContent: DataTypes.JSON,
+    creatorId: DataTypes.INTEGER,
+    updatorId: DataTypes.INTEGER,
+  }, {
+    tableName: 'n_zzzd_need_solution',
+    paranoid: true,//假的删除
+    underscored: true,
+    timestamps: true,
+    version: true,
+    freezeTableName: true
+    //freezeTableName: true,
+    // define the table's name
+  });
+};
--- a/center-order/app/base/service/impl/dbneed/diagnosisneedbusSve.js
+++ b/center-order/app/base/service/impl/dbneed/diagnosisneedbusSve.js
+const ServiceBase = require("../../sve.base");
+class diagnosisneedbusService extends ServiceBase {
+  constructor() {
+    super();
+  }
+  async test () {
+    return 'test'
+  }
+}
+module.exports = diagnosisneedbusService;
\ No newline at end of file
--- a/center-order/表的更新
+++ b/center-order/表的更新
 示例：----------------------------------开始--------------------------------------------------------------------
@@ -81,7 +81,7 @@ CREATE TABLE `a_askfor`  (
  `a_content` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '{}' COMMENT '内容 具体格式为 {xxx: url: desc: } 默认空对象',
  `user_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '申请人姓名',
  `a_status` int(11) NOT NULL DEFAULT 1 COMMENT '申请状态 1: 已发布 2: 待响应 3: 待确认方案 4: 已完成',
-  `a_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '需求id 随机 ',
+  `a_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '需求id 随机 ',
  `a_mobile` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT ' 申请人手机号',
  `a_addr` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务区域 ',
  `deleted_at` datetime(0) NULL DEFAULT NULL,