Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs

@@ -232,7 +232,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 {
                     for (int i = 0; i < array.Length; i++)
                     {
-                        if (array[i].Trim()!="")
+                        if (array[i].Trim() != "")
                         {
                             str += array[i].Substring(0, array[i].IndexOf(".")) + ",";
                         }
@@ -268,35 +268,33 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             }
             #endregion
 
-            #region 获取校长的签名盖章  批示+时间+阅 
+            #region 获取校长的签名盖章+  批示+时间+阅 
             //var listTaskLog = nWFTaskIBLL.GetLogList(dispatchEntity.processId);
-            var PrintList = nWFTaskIBLL.GetLogList(dispatchEntity.processId).OrderBy(o => o.F_CreateDate).ToList();
-            var Auditlist = dispatchAuditIBLL.ReadList(keyValue);
-            if (PrintList.Count > 0)
+            var firstList = nWFTaskIBLL.GetLogList(dispatchEntity.processId).OrderBy(o => o.F_CreateDate).ToList();
+            for (int i = 1; i < firstList.Count; i++)
             {
-                for (int i = 1; i < PrintList.Count; i++)
+                if (i == 1)
                 {
-                    if (i == 1)
-                    {
-                        dispatchEntity.Render = PrintList[i].F_Des;
-                        ViewBag.StampImg = PrintList[i].F_StampImg;
-                        ViewBag.SignImg = PrintList[i].F_SignImg;
-                    }
-                    dispatchEntity.Listarray += PrintList[i].F_CreateUserName + PrintList[i].F_CreateDate + "阅" + "&";
+                    dispatchEntity.Render = firstList[i].F_Des;
+                    ViewBag.pSList += firstList[i].F_CreateUserName + firstList[i].F_CreateDate + "阅" + "&";
                 }
             }
-            if (Auditlist != null)
+            var PrintList = nWFTaskIBLL.GetLogList(dispatchEntity.processId).GroupBy(o => o.F_CreateUserName).Select(o => new
             {
-                for (int i = 0; i < Auditlist.Count; i++)
+                F_CreateDate = o.FirstOrDefault().F_CreateDate,
+                F_CreateUserName = o.FirstOrDefault().F_CreateUserName,
+            });
+            var newList = PrintList.Where(s => PrintList.Select(mo => mo.F_CreateDate).Contains(s.F_CreateDate)).OrderBy(s => s.F_CreateDate).ToList();
+            for (int i = 1; i < newList.Count; i++)
+            {
+                if (!ViewBag.pSList.Contains(newList[i].F_CreateUserName))
                 {
-                    dispatchEntity.Listarray += Auditlist[i].AuditName + Auditlist[i].AuditTime + "阅" + "&";
+                    ViewBag.pSList += newList[i].F_CreateUserName + newList[i].F_CreateDate + "阅" + "&";
                 }
             }
-            dispatchEntity.Listarray = dispatchEntity.Listarray.TrimEnd('&');
-            List<string> aaList = new List<string>(dispatchEntity.Listarray.Split('&'));
-            ViewBag.aaList = aaList;
+            ViewBag.pSList = ViewBag.pSList.TrimEnd('&');
+            ViewBag.pSList = new List<string>(ViewBag.pSList.Split('&'));
             #endregion
-
             return View(dispatchEntity);
         }
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js

@@ -221,6 +221,8 @@ var bootstrap = function ($, learun) {
                     }
                 ],
                 mainId: 'Id',
+                sidx: 'RenderDate',
+                sord: 'desc',
                 isPage: true
             });
             page.search();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js

@@ -217,6 +217,8 @@ var bootstrap = function ($, learun) {
                     }
                 ],
                 mainId: 'Id',
+                sidx: 'RenderDate',
+                sord: 'desc',
                 isPage: true
             });
             page.search();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Print.cshtml

@@ -165,7 +165,7 @@
                 }
 
         .ps {
-            height: 500px;
+            height: auto;
             width: 90%;
             margin: 0 auto;
         }
@@ -221,6 +221,10 @@
                 text-indent: 0;
                 text-align: center;
             }
+
+        #psMain div {
+            border: 0;
+        }
     </style>
 </head>
 
@@ -234,14 +238,14 @@
 
                 <span>线</span>
             </p>
-            <h5>@Model.DisTitle</h5>
+            <h5 style="height: 36px;">@Model.DisTitle</h5>
             <div class="heder">
                 <div class="hederL"></div>
                 <div class="hederR">
                     <p><em>@Model.DisFrom</em><h6> 来 文 单 位 </h6></p>
                     <p>
                         @*<em>@Model.Copies</em>
-                        <span> 份 数 </span>*@
+                            <span> 份 数 </span>*@
                         <em>@Model.DisWork</em>
                         <span>字</span>
                         <em>@Model.DisMark</em>
@@ -266,10 +270,10 @@
                 </span>
             </div>
             @*<div class="sy">
-                <span>
-                    <em>  附  </em><em>  件：  </em><em style="color: #000000">@Model.AttachmentName</em>
-                </span>
-            </div>*@
+                    <span>
+                        <em>  附  </em><em>  件：  </em><em style="color: #000000">@Model.AttachmentName</em>
+                    </span>
+                </div>*@
             <div class="yj">
                 <div>
                     <span>呈送意见：<em style="color: #000000">@Model.Render</em></span>
@@ -283,26 +287,30 @@
                 </p>
             </div>
             <div class="ps">
-                <div>
+                <div id="mapHeight" style="height: 700px;">
                     <span>
                         批    <em> 示：</em>
-                        <em style="color: #000000">
-                            @foreach (var item in ViewBag.aaList)
-                            {
-                                <em style="display: block; height: 30px; line-height: 30px; margin-left: 60px;">@item</em>
-                            }
+                        <em style="color: #000000" id="psMain">
+                            <div style="height: auto;">
+                                @foreach (var item in ViewBag.pSList)
+                                {
+                                    <div style="height: auto;width: 60%;display:inline-block;">
+                                        <em style="display: inline-block; height: 30px; line-height: 30px; margin-left: 60px;">@item</em>
+                                    </div>
+                                }
+                            </div>
                         </em>
                     </span>
-                    <div class="ulzp" style="height: 200px; border-bottom:none;">
-                        <ul>
-                            <li>(签字):</li>
-                            <li> <img id="signImg" hidden="hidden"></li>
-                        </ul>
-                        <ul>
-                            <li>(签章):</li>
-                            <li><img id="stampImg" hidden="hidden"></li>
-                        </ul>
-                    </div>
+                    @*<div class="ulzp" style="height: 200px; border-bottom:none;">
+                            <ul>
+                                <li>(签字):</li>
+                                <li> <img id="signImg" hidden="hidden"></li>
+                            </ul>
+                            <ul>
+                                <li>(签章):</li>
+                                <li><img id="stampImg" hidden="hidden"></li>
+                            </ul>
+                        </div>*@
                 </div>
                 <p>
                     <em>@Model.DisOffice</em><span> 收 文 单 位 </span>
@@ -312,6 +320,7 @@
                     <em>@Model.DisMonth</em><span>月</span>
                     <em>@Model.DisDay</em><span>日</span>
                 </p>
+                <p style="clear: both;"></p>
             </div>
         </div>
     </div>
@@ -322,7 +331,7 @@
     <script src="~/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js"></script>
     <script>
         //盖章图片
-        var stampUrl = '/LR_NewWorkFlow/StampInfo/GetImg?keyValue=@ViewBag.StampImg';
+        @*var stampUrl = '/LR_NewWorkFlow/StampInfo/GetImg?keyValue=@ViewBag.StampImg';
         var signUrl = '/LR_SystemModule/Img/GetImg?keyValue=@ViewBag.SignImg';
         $('#signImg').attr('src', signUrl);
         $('#stampImg').attr('src', stampUrl);
@@ -336,10 +345,11 @@
         }
         stampImg.onload=function() {
             $('#stampImg').show();
-        }
+        }*@
         $('#lr_print').on('click', function () {
             $('#content').jqprint();
         });
+
     </script>
 </body>