no message

src/biz/findData.ts

@@ -187,9 +187,12 @@ export async function selectDataToTableAssociationToPage(tableModel, includeConf
     let include = [];
     for (let tableName in includeConf) {
         if (!mysqlModelMap[tableName]) throw new BizError(ERRORENUM.不存在表, `尝试进行多表联查，但是不存在${tableName}`);
-        let {where, column} = includeConf[tableName];
+        let {where, column, required} = includeConf[tableName];
         let includeInfomation = analysisParamToWhere(where, column);
         includeInfomation.model = mysqlModelMap[tableName];
+        // if (required != undefined) {
+        //     includeInfomation.required = required;
+        // }
         include.push(includeInfomation);
     }
 
@@ -228,3 +231,5 @@ export async function selectOneDataToTableAssociation(tableModel, includeConf, p
     data = data || {};
     return {data};
 }
+
+

src/config/mysqlTableConfig.ts

@@ -117,7 +117,7 @@ export const TablesConfig = [
             financingAmount: {type:Sequelize.DECIMAL(18, 2)}, //融资金额（万元）
             financingRounds: {type:Sequelize.INTEGER}, //融资轮次【枚举】
             fuHuaQiInvestment: {type:Sequelize.INTEGER}, //孵化器是否参与投资 【枚举】
-            fuHuaQiInvestmentStyle: {type:Sequelize.STRING(50)}, //孵化器投资方式
+            fuHuaQiInvestmentStyle: {type:Sequelize.INTEGER}, //孵化器投资方式
             fuHuaQiInvestmentAmount: {type:Sequelize.DECIMAL(18, 2)}, //孵化器投资金额
             investmentDate: {type:Sequelize.DATE}, //获得投资时间
             investmentInstitutionsName: {type:Sequelize.STRING(255)}, //投资机构名称
@@ -160,7 +160,9 @@ export const TablesConfig = [
             TXP: {type:Sequelize.DECIMAL(18, 2)}, //纳税（万元）
             RD: {type:Sequelize.DECIMAL(18, 2)}, //研发投入（万元）
             createTime: {type:Sequelize.DATE}, //填写时间
-            state:{type:Sequelize.INTEGER}//状态 0=否 1=是
+            isUpdate:{type:Sequelize.INTEGER},//更新状态 0=否 1=是
+            isSubmit:{type:Sequelize.INTEGER},//是否提交 0=否 1=是
+            state:{type:Sequelize.INTEGER}//审核状态 0=否 1=是
         },
         association: []
     },