From 234b6cf8944ef95c415c4898f19b8fb4d12e898f Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期日, 13 十月 2024 22:44:46 +0800
Subject: [PATCH] 工艺路线增加完工节点

---
 src/api/tigerapi/system.ts |   65 +++++++++++++++++++++++---------
 1 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/src/api/tigerapi/system.ts b/src/api/tigerapi/system.ts
index a3fb7df..dae8570 100644
--- a/src/api/tigerapi/system.ts
+++ b/src/api/tigerapi/system.ts
@@ -28,9 +28,12 @@
   EntityParams,
   EntityList,
   iSYS_ROLE_PROD,
+  pParams,
 } from './model/systemModel';
 import { defHttp } from '/@/utils/http/axios';
-import { isArray, isNullOrEmpty, isTimeViaRegExp8601 } from '/@/utils/is';
+import { isArray, isNullOrEmpty, isNullOrUnDef, isTimeViaRegExp8601 } from '/@/utils/is';
+import { isNumber } from 'xe-utils';
+import { dateUtil, formatToDateTime } from '/@/utils/dateUtil';
 
 export enum Api {
   QueryUrl = '/Base/Query',
@@ -43,6 +46,7 @@
   MenuList = '/SYS/getMenuListAll',
   SaveMenu = '/SYS/SaveMenu',
   SaveRole = '/SYS/SaveRole',
+  getSysParam = '/SYS/getSysParam',
   AddEntity = '/Base/Add',
   AddListEntity = '/Base/AddList',
   UpdateEntity = '/Base/Update',
@@ -285,7 +289,7 @@
  * @param {T} data
  * @param {string} parentField 鐖跺瓧娈靛悕
  * @param {string} idField 鍞竴key瀛楁鍚�
- * @param {string} pid_val 鐖秈d鍊�
+ * @param {string} pid 鐖秈d鍊�
  * @return {*}
  */
 export function convertToTree<T>(data: T[], parentField: string, idField: string, pid?: string) {
@@ -709,22 +713,28 @@
   if (!isNullOrEmpty(params['order'])) {
     order = params['order'] == 'descend' ? params['field'] + ' desc' : params['field'];
   }
-  const rParams = genAction(params['TABLE_NAME'], {
-    QueryAble_T: '',
-    where: sqlcmd,
-    order: order,
-    page: {
-      pageAble_T: 'string',
-      draw: 1,
-      pageIndex: params['page'],
-      pageSize: params['pageSize'],
-    },
-  });
-  return getListByPageAsync(rParams);
+  const rParams = genAction(
+    params['TABLE_NAME'],
+    !isNullOrEmpty(params['apiUrl'])
+      ? params
+      : {
+          QueryAble_T: '',
+          where: sqlcmd,
+          order: order,
+          page: {
+            pageAble_T: 'string',
+            draw: 1,
+            pageIndex: params['page'],
+            pageSize: params['pageSize'],
+          },
+        },
+    params['option'],
+  );
+  return getListByPageAsync(rParams, params['apiUrl']); //濡傛灉涓嶆兂鐢ㄩ粯璁ょ殑鍩虹鏂规硶鑾峰彇鍒嗛〉鏁版嵁锛屽彲浠ユ崲鍏朵粬鐨刟pi
 }
-async function getListByPageAsync(params: any) {
+async function getListByPageAsync(params: any, apiUrl: string | null | undefined) {
   const data = await defHttp.post(
-    { url: Api.QueryUrl, params, timeout: 50000 },
+    { url: !isNullOrEmpty(apiUrl) ? apiUrl : Api.QueryUrl, params, timeout: 50000 },
     {
       isTransformResponse: false,
     },
@@ -753,12 +763,18 @@
       Keys[k] != 'TABLE_NAME' &&
       Keys[k] != 'order' &&
       Keys[k] != 'field' &&
+      Keys[k] != 'option' &&
       Keys[k] != '0' &&
+      Keys[k] != 'apiUrl' &&
       !Keys[k].toString().endsWith('PSelect_0')
     ) {
       if (!isNullOrEmpty(params[Keys[k]].length) && isTimeViaRegExp8601(params[Keys[k]][0])) {
         sqlcmd += ` And ${Keys[k]} > '${params[Keys[k]][0]}'`;
         sqlcmd += ` And ${Keys[k]} < '${params[Keys[k]][1]}'`;
+      } else if (isNumber(params[Keys[k]])) {
+        sqlcmd += `And ${Keys[k]} = ${params[Keys[k]]}`;
+      } else if (Keys[k] == 'sqlcmd') {
+        sqlcmd += ` And ${params[Keys[k]]}`;
       } else {
         sqlcmd += `And ${Keys[k]} like '%${params[Keys[k]]}%'`;
       }
@@ -784,7 +800,7 @@
       check.Message = '璁板綍宸茬粡瀛樺湪锛屼笉鑳芥柊澧烇紒';
       return check;
     }
-    params.ID = buildUUID(); //鐢熸垚GUID
+    params['ID'] = args[1] == true ? params['ID'] : buildUUID(); //鐢熸垚GUID
     data = await defHttp.post(
       { url: Api.AddEntity, params: genAction(entityName, params) },
       {
@@ -919,7 +935,7 @@
 }
 
 /* 閫氱敤鑾峰彇瀹炰綋璁板綍 */
-export const getEntity = async (params: { sqlcmd: string; entityName: string, order: string }) => {
+export const getEntity = async (params: { sqlcmd: string; entityName: string; order: string }) => {
   const usParams = genAction(params.entityName, {
     QueryAble_T: '',
     where: params.sqlcmd,
@@ -948,3 +964,16 @@
   }
   return values;
 }
+
+/**
+ * @description: 鑾峰彇鍙傛暟
+ * @param {pParams} params
+ * @return {*}
+ */
+export const getSysParam = (params?: pParams) =>
+  defHttp.get<ApiAction<treeParamsListItem[]>>(
+    { url: Api.getSysParam, params },
+    {
+      isTransformResponse: false,
+    },
+  );

--
Gitblit v1.9.3