From e20d716bbf34ca827d25dcaad3e468d2e99a1a99 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Mon, 4 Jul 2022 11:18:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=95=E8=AF=89=E4=B8=AD=E5=BF=83--=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Sys_ReceiveComplaint/Form.cshtml     |  4 ++++
 .../Views/Sys_ReceiveComplaint/Form.js         |  3 ++-
 .../Views/Sys_ReceiveComplaint/FormView.cshtml |  4 ++++
 .../Views/Sys_ReceiveComplaint/FormView.js     |  1 +
 .../Views/Sys_SendComplaint/Form.cshtml        |  4 ++++
 .../Views/Sys_SendComplaint/Form.js            |  1 +
 .../Views/Sys_SendComplaint/FormList.cshtml    |  4 ++++
 .../Views/Sys_SendComplaint/FormList.js        |  1 +
 .../Sys_SendComplaint/FormListView.cshtml      |  6 +++++-
 .../Views/Sys_SendComplaint/FormListView.js    |  1 +
 .../Views/Sys_SendComplaint/FormView.cshtml    |  6 +++++-
 .../Views/Sys_SendComplaint/FormView.js        |  1 +
 .../Sys_ReceiveComplaintEntity.cs              |  7 ++++++-
 .../Sys_SendComplaintEntity.cs                 |  9 +++++++--
 .../Sys_SendComplaintService.cs                | 18 ++----------------
 15 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/Form.cshtml
index 3ec21da8c..894c758b6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/Form.cshtml	
@@ -15,5 +15,9 @@
         <div class="lr-form-item-title">回复内容<font face="宋体">*</font></div>
         <textarea id="ReplyContents" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull"></textarea>
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="Sys_ReceiveComplaint">
+        <div class="lr-form-item-title">附件</div>
+        <div id="FilePath" ></div>
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/Form.js
index 81a4558df..b5a02b3a4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/Form.js	
@@ -15,13 +15,14 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#FilePath').lrUploader();
         },
         initData: function () {
             if (!!keyValue) {
                 $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveComplaint/GetFormData?keyValue=' + keyValue, function (data) {
                     for (var id in data) {
                         if (!!data[id].length && data[id].length > 0) {
-                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
                         }
                         else {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/FormView.cshtml
index 2dfc6211a..033ce3753 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/FormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/FormView.cshtml	
@@ -15,5 +15,9 @@
         <div class="lr-form-item-title">回复内容<font face="宋体">*</font></div>
         <textarea id="ReplyContents" class="form-control" style="height:100px;" readonly="readonly"></textarea>
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="Sys_ReceiveComplaint">
+        <div class="lr-form-item-title">附件</div>
+        <div id="FilePath"></div>
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/FormView.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/FormView.js
index 81a4558df..635fd47b4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/FormView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/FormView.js	
@@ -15,6 +15,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#FilePath').lrUploader();
         },
         initData: function () {
             if (!!keyValue) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/Form.cshtml
index fe5dd1914..1eb6a351d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/Form.cshtml	
@@ -18,5 +18,9 @@
         <div class="lr-form-item-title">投诉意见<font face="宋体">*</font></div>
         <textarea id="Contents" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull"></textarea>
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="Sys_SendComplaint">
+        <div class="lr-form-item-title">附件</div>
+        <div id="FilePath"></div>
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendComplaint/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/Form.js
index f1d03956b..0a48c58bd 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/Form.js	
@@ -15,6 +15,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#FilePath').lrUploader();
         },
         initData: function () {
             if (!!keyValue) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormList.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormList.cshtml
index 735e23a6a..a1c0fd952 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormList.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormList.cshtml	
@@ -19,5 +19,9 @@
         <div class="lr-form-item-title">接收人<font face="宋体">*</font></div>
         <div id="ReceiverUserId"></div>
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="Sys_SendComplaint">
+        <div class="lr-form-item-title">附件</div>
+        <div id="FilePath"></div>
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormList.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormList.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormList.js
index 50c3dc3ce..f4f97e927 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormList.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormList.js	
@@ -15,6 +15,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#FilePath').lrUploader();
             $('#ReceiverUserId').lrUserSelect({ type: '1' });
         },
         initData: function () {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormListView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormListView.cshtml
index ebd40bc19..a52f98cf0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormListView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormListView.cshtml	
@@ -17,7 +17,11 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Sys_SendComplaint">
         <div class="lr-form-item-title">接收人<font face="宋体">*</font></div>
-        <input id="Receiver"  class="form-control" readonly="readonly"/>
+        <input id="Receiver" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Sys_SendComplaint">
+        <div class="lr-form-item-title">附件</div>
+        <div id="FilePath"></div>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormListView.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormListView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormListView.js
index 50c3dc3ce..f4f97e927 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormListView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormListView.js	
@@ -15,6 +15,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#FilePath').lrUploader();
             $('#ReceiverUserId').lrUserSelect({ type: '1' });
         },
         initData: function () {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormView.cshtml
index dafa879f1..2f1423331 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormView.cshtml	
@@ -12,11 +12,15 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Sys_SendComplaint">
         <div class="lr-form-item-title">主题<font face="宋体">*</font></div>
-        <input id="Title" type="text" class="form-control" readonly="readonly"/>
+        <input id="Title" type="text" class="form-control" readonly="readonly" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Sys_SendComplaint">
         <div class="lr-form-item-title">投诉意见<font face="宋体">*</font></div>
         <textarea id="Contents" class="form-control" style="height:100px;" readonly="readonly"></textarea>
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="Sys_SendComplaint">
+        <div class="lr-form-item-title">附件</div>
+        <div id="FilePath"></div>
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormView.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormView.js
index f1d03956b..0a48c58bd 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormView.js	
@@ -15,6 +15,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#FilePath').lrUploader();
         },
         initData: function () {
             if (!!keyValue) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveComplaint/Sys_ReceiveComplaintEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveComplaint/Sys_ReceiveComplaintEntity.cs
index 801277749..bae34845d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveComplaint/Sys_ReceiveComplaintEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveComplaint/Sys_ReceiveComplaintEntity.cs	
@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
     /// 日 期：2019-04-16 17:19
     /// 描 述：接收投诉意见
     /// </summary>
-    public class Sys_ReceiveComplaintEntity 
+    public class Sys_ReceiveComplaintEntity
     {
         #region  实体成员
         /// <summary>
@@ -79,6 +79,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("DELFLAG")]
         public bool? DelFlag { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [Column("FILEPATH")]
+        public string FilePath { get; set; }
         #endregion
 
         #region  扩展操作
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaintEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaintEntity.cs
index a5f49fe09..39176452b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaintEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaintEntity.cs	
@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
     /// 日 期：2019-04-16 17:09
     /// 描 述：发送投诉意见
     /// </summary>
-    public class Sys_SendComplaintEntity 
+    public class Sys_SendComplaintEntity
     {
         #region  实体成员
         /// <summary>
@@ -99,6 +99,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("REPLYFLAG")]
         public int? ReplyFlag { get; set; }
+
+        /// <summary>
+        /// ReplyFlag
+        /// </summary>
+        [Column("FILEPATH")]
+        public string FilePath { get; set; }
         #endregion
 
         #region  扩展操作
@@ -119,7 +125,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
         #endregion
         #region  扩展字段
-        
 
         #endregion
     }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaintService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaintService.cs
index ac591af1d..574d9618c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaintService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaintService.cs	
@@ -31,22 +31,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.SComplaintId,
-                t.ComplaintCode,
-                t.CreateUserId,
-                t.CreateUserName,
-                t.Title,
-                t.Contents,
-                t.CreateTime,
-                t.SendTime,
-                t.SendFlag,
-                t.AssignFlag,
-                t.AssignTime,
-                t.ReceiverId,
-                t.Receiver,
-                t.ReplyFlag
-                ");
+                strSql.Append(@"* ");
                 strSql.Append("  FROM Sys_SendComplaint t ");
                 strSql.Append("  WHERE 1=1 and t.DelFlag=0 ");
                 var queryParam = queryJson.ToJObject();
@@ -235,6 +220,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         sys_ReceiveComplaintEntity.SendTime = DateTime.Now;
                         sys_ReceiveComplaintEntity.ReplyFlag = 0;
                         sys_ReceiveComplaintEntity.DelFlag = false;
+                        sys_ReceiveComplaintEntity.FilePath = sys_SendComplaintEntity.FilePath;
                         db.Insert(sys_ReceiveComplaintEntity);
                     }
                     //更新发送投诉意见