Merge branch 'main' of git.opencomputing.cn:yumoqing/kboss

b/product/delete_user_inquiry.dspy

@@ -1,13 +1,37 @@
 async def delete_user_inquiry(ns={}):
     db = DBPools()
     async with db.sqlorContext('kboss') as sor:
-        ns_c = {
+        ids = ns.get('ids') or ns.get('id')
-            'id': ns.get('id')
+        if not ids:
-        }
+            return {
-        await sor.D('product_inquiry', ns_c)
+                'status': False,
+                'msg': '请传递id'
+            }
+        if isinstance(ids, str):
+            if '[' in ids:
+                ids = ids.replace("'", '"')
+                ids = json.loads(ids)
+            elif ',' in ids:
+                ids = ids.replace('"', '').replace("'", '').split(',')
+            else:
+                ids = [ids]
+
+        delete_count = 0
+        for inquiry_id in ids:
+            if not inquiry_id:
+                continue
+            ns_c = {
+                'id': inquiry_id
+            }
+            await sor.D('product_inquiry', ns_c)
+            delete_count += 1
+
         return {
             'status': True,
-            'msg': 'delete success'
+            'msg': 'delete success',
+            'data': {
+                'delete_count': delete_count
+            }
         }
 
 ret = await delete_user_inquiry(params_kw)

b/product/search_user_inquiry.dspy

@@ -90,6 +90,8 @@ async def search_user_inquiry(ns={}):
                     'consult_direction': '咨询方向',
                     'content': '咨询内容',
                     'feedback': '反馈状态',
+                    'remark': '备注',
+                    'create_at': '创建时间'
             }
             # 新增值映射字典，集中管理各字段的数值转换规则
             # 转换字典键为中文

b/product/update_user_inquiry.dspy

@@ -1,14 +1,40 @@
 async def update_user_inquiry(ns={}):
     db = DBPools()
     async with db.sqlorContext('kboss') as sor:
-        ns_c = {
+        ids = ns.get('ids') or ns.get('id')
-            'id': ns.get('id'),
+        if not ids:
-            'feedback': ns.get('feedback')
+            return {
-        }
+                'status': False,
-        await sor.U('product_inquiry', ns_c)
+                'msg': '请传递id'
+            }
+        if isinstance(ids, str):
+            if ids.startswith('['):
+                ids = json.loads(ids)
+            elif ',' in ids:
+                ids = ids.replace('"', '').replace("'", '').split(',')
+            else:
+                ids = [ids]
+
+        update_count = 0
+        for inquiry_id in ids:
+            if not inquiry_id:
+                continue
+            ns_c = {
+                'id': inquiry_id
+            }
+            if 'feedback' in ns:
+                ns_c['feedback'] = ns.get('feedback')
+            if 'remark' in ns:
+                ns_c['remark'] = ns.get('remark')
+            await sor.U('product_inquiry', ns_c)
+            update_count += 1
+
         return {
             'status': True,
-            'msg': 'update success'
+            'msg': 'update success',
+            'data': {
+                'update_count': update_count
+            }
         }
 
 ret = await update_user_inquiry(params_kw)