no message

src/biz/mongo/selectData.ts

@@ -9,28 +9,28 @@ import { BizError } from "../../util/bizError";
  * @param param 
  * @returns 
  */
-export async function selectOneDataByParam(tableName:string, column:any, param:any) {
+export async function selectOneDataByParam(tableName:string, param:any) {
     let model = modelMap[tableName];
     if (!model) throw new BizError(ERRORENUM.不存在表);
 
-    let data = model.findOnceData(column, param);
+    let data = model.findOnceData(param);
     return {data};
 }
 
-export async function selectDataListByParam(tableName:string, column:any, param:any) {
+export async function selectDataListByParam(tableName:string, param:any) {
     let model = modelMap[tableName];
     if (!model) throw new BizError(ERRORENUM.不存在表);
 
-    let data = model.findManyData(column, param);
+    let data = model.findManyData(param);
     return {data};
 }
 
-export async function selectDataListToPageByParam(tableName:string, column:any, param:any, pageNumber:number, pageSize:number) {
+export async function selectDataListToPageByParam(tableName:string, param:any, pageNumber:number, pageSize:number) {
     pageSize = pageSize || 10;
     let model = modelMap[tableName];
     if (!model) throw new BizError(ERRORENUM.不存在表);
     
-    let data = model.findDataToPage(column, param, (pageNumber-1)*10, pageSize );
+    let data = model.findDataToPage(param, (pageNumber-1)*10, pageSize );
     return {data};
 }
 
@@ -50,14 +50,4 @@ export async function aggragateParam(tableName:string, param:any) {
     let data = await model.aggragateData(param);
 
     return {data};
-}
-
-
-export async function selectDataToTableAssociation(tableName:string, associatedTable:string, column:any, param:any) {
-    let model = modelMap[tableName];
-    if (!model) throw new BizError(ERRORENUM.不存在表);
-
-    let data = await model.findDataToTableAssociation(associatedTable, column, param);
-    
-    return {data};
 }
\ No newline at end of file

src/biz/mysql/findData.ts

@@ -21,9 +21,9 @@ function analysisParamToWhere(param) {
  * @param param 
  * @returns 
  */
-export async function selectOneDataByParam(tableModel, param) {
+export async function selectOneDataByParam(tableModel, column:any, param) {
     let where = analysisParamToWhere(param);
-    let data = tableModel.findOne({where});
+    let data = tableModel.findOne({attributes: column, where});
     return {data};
 }
 
@@ -34,9 +34,9 @@ export async function selectOneDataByParam(tableModel, param) {
  * @param param 
  * @returns 
  */
-export async function selectDataListByParam(tableModel, param:any) {
+export async function selectDataListByParam(tableModel, column:any, param:any) {
     let where = analysisParamToWhere(param);
-    let data = tableModel.findAll({where});
+    let data = tableModel.findAll({attributes: column, where});
     return {data};
 }
 
@@ -49,10 +49,10 @@ export async function selectDataListByParam(tableModel, param:any) {
  * @param pageSize 
  * @returns 
  */
-export async function selectDataListToPageByParam(tableModel, param:any, pageNumber:number, pageSize:number) {
+export async function selectDataListToPageByParam(tableModel, column:any, param:any, pageNumber:number, pageSize:number) {
     pageSize = pageSize || 10;
     let where = analysisParamToWhere(param);
-    let data = tableModel.findAll({where, offset:(pageNumber-1)*10, limit:pageSize});
+    let data = tableModel.findAll({attributes: column, where, offset:(pageNumber-1)*10, limit:pageSize});
     return {data};
 }
 
@@ -70,4 +70,25 @@ export async function associationSelect(tableName:string, param:any) {
     let data = await model.aggragateData(param);
 
     return {data};
+}
+
+
+/**
+ * 多表联查
+ * @param tableName 
+ * @param associatedTable 
+ * @param column 
+ * @param param 
+ * @returns 
+ */
+export async function selectDataToTableAssociation(tableModel, associatedTable:string, column:any, param:any) {
+    let where = analysisParamToWhere(param);
+    let data = tableModel.findAll({
+        include: [{
+            model: associatedTable,
+            attributes: column, //指定关联表查询的字段
+        }],
+        where
+    });
+    return {data};
 }
\ No newline at end of file

src/model/modelBind.ts

@@ -24,7 +24,6 @@ export async function initModel() {
         modelMap[tableName].findDataCount = findDataCountBind;
         modelMap[tableName].findDataToPage = findDataToPageBind;
         modelMap[tableName].aggragateData = aggragateDataBind;
-        modelMap[tableName].findDataToTableAssociation = findDataToTableAssociationBind;
         
     }
 }
@@ -75,14 +74,4 @@ async function aggragateDataBind(param) {
 }
 
 
-async function findDataToTableAssociationBind(associatedTable:string, column:any, param:any) {
-    return await this.find({
-        include: [{
-            model: associatedTable,
-            attributes: column, //指定关联表查询的字段
-        }],
-        where: param
-    })
-}
-
 export {modelMap};
\ No newline at end of file