20231129

2023-11-29 16:38:19 +08:00
parent 882419768f
commit e7196c4cdc
79 changed files with 7436 additions and 6564 deletions
@@ -1,23 +1,31 @@
 'use strict';
 const dbName = require('../../../../../dao/config.js')
 module.exports = {
-	/**
-	 * 新增加工单
-	 * @url client/process/kh/add 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
+    /**
+     * 新增加工单
+     * @url client/process/kh/add 前端调用的url参数地址
+     * data 请求参数
+     * @param event
+     */
+    main: async (event) => {
+        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
+        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
+        let res = {code: 0, msg: ""};
+        // 业务逻辑开始-----------------------------------------------------------
+        let dbName = "jjx-process-sheet";
+        res.id = await vk.baseDao.add({
+            dbName,
+            dataJson: {
+                ...data,
+                ...{
+                    userId: data.uid,
+                    answerNumber: 0
+                }
+            }
+        });


-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
+        // 业务逻辑结束-----------------------------------------------------------
+        return res;
+    }
 }
@@ -1,23 +1,65 @@
 'use strict';
 const dbName = require('../../../../../dao/config.js')
 module.exports = {
-	/**
-	 * 获取加工单
-	 * @url client/process/pub/getList 前端调用的url参数地址
-	 * data 请求参数
-	 * @param {String} params1  参数1
-	 */
-	main: async (event) => {
-		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
-		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid } = data;
-		let res = { code: 0, msg: "" };
-		// 业务逻辑开始-----------------------------------------------------------
+    /**
+     * 获取加工单
+     * @url client/process/pub/getList 前端调用的url参数地址
+     * data 请求参数
+     * @param {String} params1  参数1
+     */
+    main: async (event) => {
+        let {data = {}, userInfo, util, filterResponse, originalParam} = event;
+        let {customUtil, uniID, config, pubFun, vk, db, _} = util;
+        let {uid, userId, pageIndex, pageSize, keyword, categoryIds, provinceCodes} = data;
+        let res = {code: 0, msg: ""};
+        // 业务逻辑开始-----------------------------------------------------------
+        const dbName = "jjx-process-sheet";
+        const whereJson = {};
+
+        if (vk.pubfn.isNotNull(keyword)) {
+            whereJson.name = new RegExp(keyword)
+        }
+        if (vk.pubfn.isNotNull(userId)) {
+            whereJson.userId = userId
+        }
+
+        if (vk.pubfn.isNotNull(categoryIds)) {
+            whereJson.categoryIds = _.in(categoryIds)
+        }
+
+        if (vk.pubfn.isNotNull(provinceCodes)) {
+            whereJson['address.province.code'] = _.in(provinceCodes)
+        }
+
+        res = await vk.baseDao.selects({
+            dbName,
+            pageIndex,
+            pageSize,
+            whereJson,
+            foreignDB: [
+                {
+                    dbName: "uni-id-users",
+                    localKey: "userId",
+                    foreignKey: "_id",
+                    as: "user",
+                    limit: 1, // limit=1则以对象形式返回
+                    fieldJson: {
+                        _id: true,
+                        company: {
+                            companyName: true
+                        },
+                        person: {
+                            personName: true
+                        },
+                        businessCard: true,
+                        accountType: true,
+                    },
+                }
+            ]
+        });


-
-
-		// 业务逻辑结束-----------------------------------------------------------
-		return res;
-	}
+        // 业务逻辑结束-----------------------------------------------------------
+        return res;
+    }
 }