From 5f6cb53e03e550935cbea1ed06c3d6c2730ce110 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Mon, 18 Nov 2024 14:00:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=9F=A5=E7=9C=8B=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Modules/Arrangelesson.cs                         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs
index 0475ba752..5c25204dd 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs	
@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net.Http;
+using System.Text;
 using System.Web;
 using Learun.Application.Base.SystemModule;
 using Learun.Application.Organization;
@@ -520,7 +522,7 @@ namespace Learun.Application.WebApi.Modules
             return Success(result);
         }
 
-        public string GetQRCode(dynamic _)
+        public Response GetQRCode(dynamic _)
         {
             string keyValue = Request.Query["keyValue"];
             int Types = Request.Query["Types"];
@@ -530,16 +532,18 @@ namespace Learun.Application.WebApi.Modules
                 var Data = officeEquipmentIBLL.GetOfficeEquipmentEntity(keyValue);
                 var emp = empinfoIBLL.GetEmpInfoEntityByEmpNo(Data.Name);
                 var Unit = dataItemIBLL.GetDetailList("sldw").Where(x => x.F_ItemValue == Data.Unit).FirstOrDefault();
-                result = "资产名称:" + Data.DeviceName + ",资产编号:" + Data.Code + ",品牌:" + Data.Brand + ",型号:" + Data.Model + ",参数:" + Data.Argument + ",单位:(" + Unit.F_ItemName + "),参数:" + Data.Nuantity + ",使用管理人:" + emp.EmpName + ",备注:" + Data.Remark;
+                result = "资产名称:" + Data.DeviceName + ";<br>资产编号:" + Data.Code + ";<br>品牌:" +
+                Data.Brand + ";<br>型号:" + Data.Model + ";<br>参数:" + Data.Argument + ";<br>单位:(" + Unit.F_ItemName + ");<br>数量:" + Data.Nuantity + ";<br>使用管理人:" + emp.EmpName + ";<br>备注:" + Data.Remark;
             }
             else
             {
                 var Data = fixedAssetsIBLL.GetFixedAssetsEntity(keyValue);
                 var emp = empinfoIBLL.GetEmpInfoEntityByEmpNo(Data.UsePeople);
                 var Unit = dataItemIBLL.GetDetailList("sldw").Where(x => x.F_ItemValue == Data.Unit).FirstOrDefault();
-                result = "资产名称:" + Data.AssetsName + ",资产编号:" + Data.Code + ",品牌:" + Data.Brand + ",型号:" + Data.Model + ",参数:" + Data.Argument + ",单位:(" + Unit.F_ItemName + "),参数:" + Data.Nuantity + ",使用管理人:" + emp.EmpName + ",备注:" + Data.Remark;
+                result = "资产名称:" + Data.AssetsName + ";<br>资产编号:" + Data.Code + ";<br>品牌:" +
+                Data.Brand + ";<br>型号:" + Data.Model + ";<br>参数:" + Data.Argument + ";<br>单位:(" + Unit.F_ItemName + ");<br>数量:" + Data.Nuantity + ";<br>使用管理人:" + emp.EmpName + ";<br>备注:" + Data.Remark;
             }
-            return result;
+            return Response.AsText(result).WithContentType("text/html;charset=utf-8");
         }
     }
 }
\ No newline at end of file