From 7e85de944bf9c4bd301d9958670d95c793f30caf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Thu, 23 Mar 2023 14:18:56 +0800
Subject: [PATCH] 'commit'

---
 ETL/Mars/Model/HuiJiModel.py | 7 ++++++-
 ETL/Mars/Start.py            | 9 ++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ETL/Mars/Model/HuiJiModel.py b/ETL/Mars/Model/HuiJiModel.py
index 474d52f..d7f6856 100644
--- a/ETL/Mars/Model/HuiJiModel.py
+++ b/ETL/Mars/Model/HuiJiModel.py
@@ -459,11 +459,16 @@ class HuiJiModel(object):
         list1, cnt = Db.paginate(sql, page, limit)
         return list1, cnt
 
-    def getFormType(self):
+    def getFormTypeList(self):
         sql = "select * from t_huiji_form_type"
         list1, cnt = Db.paginate(sql, 1, 1000)
         return list1, cnt
 
+    def getFormType(self, type_id):
+        sql = "select * from t_huiji_form_type where type_id=%s" % type_id
+        list1, cnt = Db.paginate(sql, 1, 1000)
+        return list1, cnt
+
     def addFormType(self, type_name):
         sql = "insert into t_huiji_form_type(type_id,type_name) values('%s','%s')"
         type_id = uuid.uuid1()
diff --git a/ETL/Mars/Start.py b/ETL/Mars/Start.py
index e1a3bda..a9ff895 100644
--- a/ETL/Mars/Start.py
+++ b/ETL/Mars/Start.py
@@ -325,9 +325,16 @@ def getTaskFillInfo():
 
 
 # 获取表单类型
+@app.route('/Mars/getFormTypeList', methods=['GET'])
+def getFormTypeList():
+    res, cnt = hm.getFormTypeList()
+    return jsonify(CommonUtil.renderJsonForLayUI(res, cnt))
+
+
 @app.route('/Mars/getFormType', methods=['GET'])
 def getFormType():
-    res, cnt = hm.getFormType()
+    type_id = request.args.get("type_id")
+    res, cnt = hm.getFormType(type_id)
     return jsonify(CommonUtil.renderJsonForLayUI(res, cnt))