Merge branch 'master' of http://123.207.147.179:8888/node_server/yafangsuo_dataServer

src/biz/mysql/findData.ts

@@ -89,6 +89,7 @@ function analysisParamToWhere(param, column) {
 export async function selectOneDataByParam(tableModel, param, column) {
     let selectParam = analysisParamToWhere(param, column);
     let data = await tableModel.findOne(selectParam);
+    data = data || {};
     return {data};
 }
 
@@ -151,10 +152,10 @@ export async function selectDataToTableAssociation(tableModel, includeConf, para
     let include = [];
     for (let tableName in includeConf) {
         if (!mysqlModelMap[tableName]) throw new BizError(ERRORENUM.不存在表, `尝试进行多表联查，但是不存在${tableName}`);
-        include.push({
-            attributes : includeConf[tableName],
-            model : mysqlModelMap[tableName]
-        });
+        let {where, column} = includeConf[tableName];
+        let includeInfomation = analysisParamToWhere(where, column);
+        includeInfomation.model = mysqlModelMap[tableName];
+        include.push(includeInfomation);
     }
 
     let selectParam:any = analysisParamToWhere(param, column);
@@ -178,11 +179,10 @@ export async function selectDataToTableAssociationToPage(tableModel, includeConf
     let include = [];
     for (let tableName in includeConf) {
         if (!mysqlModelMap[tableName]) throw new BizError(ERRORENUM.不存在表, `尝试进行多表联查，但是不存在${tableName}`);
-        include.push({
-            attributes : includeConf[tableName],
-            model : mysqlModelMap[tableName]
-        });
-        // include.push({model:mysqlModelMap[tableName]});
+        let {where, column} = includeConf[tableName];
+        let includeInfomation = analysisParamToWhere(where, column);
+        includeInfomation.model = mysqlModelMap[tableName];
+        include.push(includeInfomation);
     }
 
     let selectParam:any = analysisParamToWhere(param, column);
@@ -207,15 +207,16 @@ export async function selectOneDataToTableAssociation(tableModel, includeConf, p
     let include = [];
     for (let tableName in includeConf) {
         if (!mysqlModelMap[tableName]) throw new BizError(ERRORENUM.不存在表, `尝试进行多表联查，但是不存在${tableName}`);
-        include.push({
-            attributes : includeConf[tableName],
-            model : mysqlModelMap[tableName]
-        });
+        let {where, column} = includeConf[tableName];
+        let includeInfomation = analysisParamToWhere(where, column);
+        includeInfomation.model = mysqlModelMap[tableName];
+        include.push(includeInfomation);
     }
 
     let selectParam:any = analysisParamToWhere(param, column);
     selectParam.include = include;
 
     let data = await tableModel.findOne(selectParam);
+    data = data || {};
     return {data};
 }

src/biz/mysql/updateData.ts

 
+import { Op, Sequelize } from "sequelize";
+
+
 /**
- * 批量修改数据
- * @param tableName 表名
- * @param data 
+ * where条件查询参数
+ * @param param 
+ * %like%：模糊查询 {列名: {"%like%": }}
+ * %gt%：大于 {列名: {"%gt%": }}
+ * %gte%：大于等于 {列名: {"%gte%": }}
+ * %lt%：小于 {列名: {"%lt%": }}
+ * %lte%：小于等于 {列名: {"%lte%": }}
+ * %between%：查询范围内数据 {列名: {"%between%": ["开始参数", "结束参数"]}} ---BETWEEN 开始参数 AND 结束参数
+ * %notBetween%：查询不在范围内数据 {列名: {"%notBetween%": ["开始参数", "结束参数"]}} ---NOT BETWEEN 开始参数 AND 结束参数
+ * %orderDesc%: order by DESC {"%orderDesc%": "列名"}
+ * %limit%: {"%limit%": 数量}
  * @returns 
  */
+function analysisParamToWhere(param) {
+    let where = {};
+    let order = [];
+    let limit = 0;
+    for (let key in param) {  
+        if (typeof param[key] == "object") {
+            where[key] = {};
+            for (let whereKey in param[key]){
+                switch(whereKey) {
+                    case "%like%":
+                        where[key][Op.like] = `%${param[key]["%like%"]}%`;
+                    break;
+                    case "%gt%":
+                        where[key][Op.gt] = param[key]["%gt%"];
+                    break;
+                    case "%gte%":
+                        where[key][Op.gte] = param[key]["%gte%"];
+                    break;
+                    case "%lt%":
+                        where[key][Op.lt] = param[key]["%lt%"];
+                    break;
+                    case "%lte%":
+                        where[key][Op.lte] = param[key]["%lte%"];
+                    break;
+                    case "%between%":
+                        where[key][Op.between] = param[key]["%between%"];
+                    break;
+                    case "%notBetween%":
+                        where[key][Op.notBetween] = param[key]["%notBetween%"];
+                    break;
+                    case "%in%":
+                        where[key][Op.in] = param[key]["%in%"];
+                    break;
+                    case "%notIn%":
+                        where[key][Op.notIn] = param[key]["%notIn%"];
+                    break;
+                }
+            }
+        }else {
+            switch (key) {
+                case "%orderDesc%":
+                    order = [[Sequelize.col(param[key]), "DESC"]];
+                break;
+                case "%orderAsc%":
+                    order = [[Sequelize.col(param[key]), "ASC"]];
+                break;
+                case "%limit%":
+                    limit = param[key];
+                break;
+                default: where[key] = param[key];
+            }
+        }
+    }
+
+    let selectParam:any = {where};
+    if (order && order.length) selectParam.order = order;
+    if (limit) selectParam.limit = limit;
+    return selectParam;
+}
+
+
 export async function updateManyData(tableModel, param:object, data:object) {
+    let where = analysisParamToWhere(param);
 
-    await tableModel.update(data, {where:param});
+    await tableModel.update(data, where);
 
     return {isSuccess:true};
 }
\ No newline at end of file