Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

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

@@ -123,7 +123,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         /// <returns></returns>
         [HttpGet]
         [AjaxOnly]
-        public ActionResult GetCanInputFlag(string name,string AcademicYearNo,string Semester)
+        public ActionResult GetCanInputFlag(string name, string AcademicYearNo, string Semester)
         {
             bool CanInputFlag = true;
             var entity = eADateArrangeIBLL.GetEntityByNameSemester(name, AcademicYearNo, Semester);
@@ -264,7 +264,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             stuScoreNotPassIBLL.InitScore();
             return Success("操作成功！");
         }
-        
+
         #endregion
 
         #region 扩展数据
@@ -290,7 +290,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult GetLessonNoDataOfAllWithNo()
         {
-            var data = stuScoreNotPassIBLL.GetLessonNoDataOfAll("", "");
+            var data = stuScoreNotPassIBLL.GetLessonNoDataOfAll("", "", "", "");
             foreach (var item in data)
             {
                 item.text = string.Format("{0}({1})", item.text, item.value);
@@ -304,10 +304,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         /// <returns></returns>
         [HttpGet]
         [AjaxOnly]
-        public ActionResult GetLessonNoDataWithNo()
+        public ActionResult GetLessonNoDataWithNo(string AcademicYearNo, string Semester)
         {
             var loginInfo = LoginUserInfo.Get();
-            var data = stuScoreNotPassIBLL.GetLessonNoDataOfAll(loginInfo.account, loginInfo.Description);
+            var data = stuScoreNotPassIBLL.GetLessonNoDataOfAll(loginInfo.account, loginInfo.Description, AcademicYearNo, Semester);
             foreach (var item in data)
             {
                 item.text = string.Format("{0}({1})", item.text, item.value);
@@ -324,7 +324,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult GetClassNoDataOfAll(string lessonNo)
         {
-            var data = stuScoreNotPassIBLL.GetClassNoData("", "", lessonNo);
+            var data = stuScoreNotPassIBLL.GetClassNoData("", "", lessonNo, "", "");
 
             return Success(data);
         }
@@ -334,10 +334,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         /// <returns></returns>
         [HttpGet]
         [AjaxOnly]
-        public ActionResult GetClassNoData(string lessonNo)
+        public ActionResult GetClassNoData(string lessonNo, string AcademicYearNo, string Semester)
         {
             var loginInfo = LoginUserInfo.Get();
-            var data = stuScoreNotPassIBLL.GetClassNoData(loginInfo.account, loginInfo.Description, lessonNo);
+            var data = stuScoreNotPassIBLL.GetClassNoData(loginInfo.account, loginInfo.Description, lessonNo, AcademicYearNo, Semester);
 
             return Success(data);
         }
@@ -466,11 +466,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpPost, ValidateInput(false)]
-        public ActionResult ExportInputScoreList(string headdata,string rowdata)
+        public ActionResult ExportInputScoreList(string headdata, string rowdata)
         {
             var headData = JsonConvert.DeserializeObject<List<colModel>>(headdata);
             var rowData = JsonConvert.DeserializeObject<List<List<colModel>>>(rowdata);
-            
+
             var result = new List<Dictionary<string, string>>();
             foreach (var item in rowData)
             {
@@ -508,7 +508,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         /// <summary>
         /// 列
         /// </summary>
-        public class colModel {
+        public class colModel
+        {
             public string label { get; set; }
             public string name { get; set; }
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/IndexStudent.cshtml

@@ -7,6 +7,12 @@
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="AcademicYearNo" type="lrselect" class="lr-select" style="width: 200px;"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="Semester" type="lrselect" class="lr-select" style="width: 200px;"></div>
+                    </div>
                     <div class="lr-layout-tool-item">
                         <div id="LessonNo" type="lrselect" class="lr-select" style="width: 200px;"></div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/IndexStudent.js

@@ -54,6 +54,21 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
+            $('#AcademicYearNo').lrselect({
+                placeholder: "学年",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "学期",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                value: 'value',
+                text: 'text'
+            });
             $('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname', placeholder: '请选择课程' });
             $('#ClassRoomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname', placeholder: '请选择教室' });
             $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname', placeholder: '请选择教师' });
@@ -64,7 +79,12 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: '学年', name: 'AcademicYearNo', width: 70, align: "left" },
                     { label: '学期', name: 'Semester', width: 60, align: "left" },
-                    { label: '考试日期', name: 'ExamDate', width: 120, align: "left" },
+                    {
+                        label: '考试日期', name: 'ExamDate', width: 120, align: "left"
+                        , formatter: function (v) {
+                            return learun.formatDate(v, "yyyy-MM-dd");
+                        }
+                    },
                     { label: '考试时间', name: 'ExamTime', width: 120, align: "left" },
                     { label: '课程编号', name: 'LessonNo', width: 100, align: "left" },
                     { label: '课程名称', name: 'LessonName', width: 200, align: "left" },
@@ -78,7 +98,7 @@ var bootstrap = function ($, learun) {
                     { label: '座位编号', name: 'SitNumber', width: 100, aligndd: "left" }
                 ],
                 mainId: 'AETId',
-                sidx: 'ExamDate asc, LessonNo asc,ClassRoomNo asc,ClassNo asc,SitNumber asc',
+                sidx: 'ExamDate desc, LessonNo asc,ClassRoomNo asc,ClassNo asc,SitNumber asc',
                 isPage: true
             });
             page.search();
@@ -88,8 +108,7 @@ var bootstrap = function ($, learun) {
             param.StartTime = datebegin;
             param.EndTime = dateend;
             var loginInfo = learun.clientdata.get(['userinfo']);
-            param.StuNo = loginInfo.account; 
-            console.log(param.StuNo);
+            param.StuNo = loginInfo.account;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/IndexTeach.cshtml

@@ -7,6 +7,12 @@
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="AcademicYearNo" type="lrselect" class="lr-select" style="width: 200px;"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="Semester" type="lrselect" class="lr-select" style="width: 200px;"></div>
+                    </div>
                     <div class="lr-layout-tool-item">
                         <div id="LessonNo" type="lrselect" class="lr-select" style="width: 200px;"></div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeExamTermNew/IndexTeach.js

@@ -75,6 +75,8 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/Exam_ArrangeExamTermNew/GetPageList',
                 headData: [
+                    { label: '学年', name: 'AcademicYearNo', width: 70, align: "left" },
+                    { label: '学期', name: 'Semester', width: 60, align: "left" },
                     {
                         label: '考试日期', name: 'ExamDate', width: 200, align: "left", formatter: function (v) {
                             return learun.formatDate(v, "yyyy-MM-dd");
@@ -89,7 +91,7 @@ var bootstrap = function ($, learun) {
                     { label: '教室名称', name: 'ClassroomName', width: 200, align: "left" }
                 ],
                 mainId: 'EPIId',
-                sidx: 'ExamDate asc,ExamTime asc,LessonNo asc,ClassroomNo asc',
+                sidx: 'ExamDate desc,ExamTime asc,LessonNo asc,ClassroomNo asc',
                 isPage: true
             });
             page.search();
@@ -100,7 +102,6 @@ var bootstrap = function ($, learun) {
             param.EndTime = dateend;
             var loginInfo = learun.clientdata.get(['userinfo']);
             param.EmpNo = loginInfo.account;
-            console.log(param.EmpNo,111);
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js

@@ -444,7 +444,16 @@ var bootstrap = function ($, learun) {
                 allowSearch: false,
                 url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetAcademicYearNoData',
                 value: 'value',
-                text: 'text'
+                text: 'text',
+                select: function (item) {
+                    if (!!item) {
+                        $("#LessonNo").lrselectRefresh({
+                            url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetLessonNoDataWithNo?AcademicYearNo=' + item.value + '&Semester=' + $('#Semester').lrselectGet(),
+                            value: 'value',
+                            text: 'text',
+                        });
+                    }
+                }
             });
             //学期
             $('#Semester').lrselect({
@@ -452,19 +461,28 @@ var bootstrap = function ($, learun) {
                 allowSearch: false,
                 url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
                 value: 'value',
-                text: 'text'
+                text: 'text',
+                select: function (item) {
+                    if (!!item) {
+                        $("#LessonNo").lrselectRefresh({
+                            url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetLessonNoDataWithNo?AcademicYearNo=' + $('#AcademicYearNo').lrselectGet() + '&Semester=' + item.value,
+                            value: 'value',
+                            text: 'text',
+                        });
+                    }
+                }
             });
             //课程
             $('#LessonNo').lrselect({
                 placeholder: "请选择课程",
                 allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetLessonNoDataWithNo',
+                //url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetLessonNoDataWithNo',
                 value: 'value',
                 text: 'text',
                 select: function (item) {
                     if (!!item) {
                         $("#ClassNo").lrselectRefresh({
-                            url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetClassNoData?lessonNo=' + item.value,
+                            url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetClassNoData?lessonNo=' + item.value + '&AcademicYearNo=' + $('#AcademicYearNo').lrselectGet() + '&Semester=' + $('#Semester').lrselectGet(),
                             value: 'value',
                             text: 'text',
                         });
@@ -475,7 +493,7 @@ var bootstrap = function ($, learun) {
             $('#ClassNo').lrselect({
                 placeholder: "请选择班级",
                 allowSearch: true,
-                url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetClassNoData',
+                //url: top.$.rootUrl + '/EducationalAdministration/StuScoreNotPass/GetClassNoData',
                 value: 'value',
                 text: 'text'
             });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/MessageRindController.cs

@@ -4,6 +4,7 @@ using Learun.Application.TwoDevelopment.LR_Desktop;
 using System.Web.Mvc;
 using System.Collections.Generic;
 using System.Collections;
+using System;
 
 namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
 {
@@ -17,6 +18,7 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
     public class MessageRindController : MvcControllerBase
     {
         private MessageRindIBLL messageRindIBLL = new MessageRindBLL();
+        private PsychologyReplyInfoIBLL psychologyReplyInfoIBLL = new PsychologyReplyInfoBLL();
 
         #region 视图功能
 
@@ -99,7 +101,47 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
         public ActionResult GetListForUnread()
         {
             var data = messageRindIBLL.GetListForUnread();
+            //心理咨询数据
+            var PsychologyReplyData = psychologyReplyInfoIBLL.GetListForUnread();
             List<Hashtable> list = new List<Hashtable>();
+            foreach (var item in PsychologyReplyData)
+            {
+                var url = "/LR_Desktop/PsychologyReplyInfo/Index";
+
+                //跳转地址
+                if (item.Description == "学生")
+                {
+                    url = "/EducationalAdministration/PsychologyInfo/Index";
+                }
+                else
+                {
+                    if (item.State == 3)
+                    {
+                        url = "/LR_Desktop/PsychologyReplyInfo/Index3";
+                    }
+                    else if (item.State == 4)
+                    {
+                        url = "/LR_Desktop/PsychologyReplyInfo/Index4";
+                    }
+                    else if (item.State == 5)
+                    {
+                        url = "/LR_Desktop/PsychologyReplyInfo/IndexFive";
+                    }
+                    else if (item.State == 6)
+                    {
+                        url = "/LR_Desktop/PsychologyReplyInfo/IndexSix";
+                    }
+                }
+                Hashtable ht = new Hashtable();
+                ht["MessageId"] = item.Id;
+                ht["SenderName"] = "";
+                ht["TheTitle"] = "心理咨询";
+                ht["TheContent"] = item.Concent;
+                ht["ConnectionUrl"] = url + "?keyvalue=";
+                ht["InstanceId"] = item.Id;
+                ht["isReply"] = item.IsReply;
+                list.Add(ht);
+            }
             foreach (var entity in data)
             {
                 Hashtable ht = new Hashtable();
@@ -109,6 +151,7 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
                 ht["TheContent"] = entity.TheContent;
                 ht["ConnectionUrl"] = entity.ConnectionUrl;
                 ht["InstanceId"] = entity.InstanceId;
+                ht["isReply"] = 1;
                 list.Add(ht);
             }
             return ToJsonResult(list);
@@ -173,11 +216,18 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
         /// <returns></returns>
         [HttpPost]
         [AjaxOnly]
-        public ActionResult SaveReadSigns(string keyValue)
+        public ActionResult SaveReadSigns(string keyValue, string title)
         {
             if (!string.IsNullOrEmpty(keyValue))
             {
-                messageRindIBLL.SaveReadSigns(keyValue);
+                if (title.Contains("心理咨询"))
+                {
+                    psychologyReplyInfoIBLL.UpdateEntity(keyValue);
+                }
+                else
+                {
+                    messageRindIBLL.SaveReadSigns(keyValue);
+                }
             }
             return Success("保存成功！");
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/PsychologyReplyInfoController.cs

@@ -52,7 +52,7 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
         {
             return View();
         }
-        
+
         /// <summary>
         /// 表单页
         /// <summary>
@@ -71,7 +71,7 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
         {
             return View();
         }
-        
+
         /// <summary>
         /// 表单页
         /// <summary>
@@ -127,7 +127,16 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
         {
             return View();
         }
-        
+        /// <summary>
+        /// 汇总表
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormGatherView()
+        {
+            return View();
+        }
+
         #endregion
 
         #region 获取数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml

@@ -32,8 +32,8 @@
             color: blue;
             border: 1px solid blue;
             border-radius: 3px;
-            cursor:pointer;
-            margin-bottom:5px;
+            cursor: pointer;
+            margin-bottom: 5px;
         }
     </style>
 </head>
@@ -62,6 +62,7 @@
                 dataType: "json",
                 async: false,
                 success: function (data) {
+                    //console.log(data);
                     var content = "";
                     if (data.length > 0) {
                         content += "<ul id='uldata'>";
@@ -76,7 +77,22 @@
                             }
                             var param = data[i]["TheTitle"] + "、" + data[i]["InstanceId"] + "、" + data[i]["MessageId"] + "、" + data[i]["ConnectionUrl"];
                             content += "<li>";
-                            content += "&nbsp;&nbsp;&nbsp;&nbsp;【" + data[i]["TheTitle"] + "】" + theContent + "&nbsp;&nbsp;";
+                            if (data[i]["TheTitle"].indexOf('心理咨询') != -1) {
+                                if (data[i]["isReply"] == 1) {
+                                    //已回复绿色显示
+                                    content += "<span style='color:green;'>";
+                                    content += "&nbsp;&nbsp;&nbsp;&nbsp;【" + data[i]["TheTitle"] + "】" + theContent + "&nbsp;&nbsp;";
+                                    content += "</span>";
+                                } else {
+                                    //待回复红色显示
+                                    content += "<span style='color:red;'>";
+                                    content += "&nbsp;&nbsp;&nbsp;&nbsp;【" + data[i]["TheTitle"] + "】" + theContent + "&nbsp;&nbsp;";
+                                    content += "</span>";
+                                }
+                            } else {
+                                content += "&nbsp;&nbsp;&nbsp;&nbsp;【" + data[i]["TheTitle"] + "】" + theContent + "&nbsp;&nbsp;";
+                            }
+
                             content += '<a id="' + param + '"  href="javascript:void(0);" class="lr-item" style="color:blue;textDecoration:underline">点击查看>>';
                             content += "</a>";
                             content += "</li>";
@@ -97,9 +113,10 @@
 
             //更改状态为已读
             var MessageId = params[2];
+            var title = params[0];
             if (top.learun.checkrow(MessageId)) {
                 $.ajax({
-                    url: top.$.rootUrl + '/LR_Desktop/MessageRind/SaveReadSigns',
+                    url: top.$.rootUrl + '/LR_Desktop/MessageRind/SaveReadSigns?title=' + title,
                     type: "post",
                     data: { keyValue: MessageId },
                     dataType: "json",
@@ -108,7 +125,6 @@
                         //弹窗查看详情
                         var keyValue = params[1];
                         var ConnectionUrl = params[3];
-                        var title = params[0];
                         if (top.learun.checkrow(keyValue)) {
                             top.learun.layerForm({
                                 id: 'formview',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/FormGatherView.cshtml

@@ -0,0 +1,79 @@
+@{
+    ViewBag.Title = "心理咨询回复";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">学号</div>
+        <input id="StuNo" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">姓名</div>
+        <input id="StuName" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">系部</div>
+        <div id="DeptNo" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">专业</div>
+        <div id="MajorNo" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">班级</div>
+        <div id="ClassNo" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">身份证号</div>
+        <input id="IdentityCardNo" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">性别</div>
+        <div id="GenderNo" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">是否单亲</div>
+        <div id="IsSingle" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">联系电话</div>
+        <input id="mobile" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">校内电话</div>
+        <input id="InSchoolTelephone" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">现住址</div>
+        <input id="InSchoolAddress" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="PsychologyReplyInfo">
+        <div class="lr-form-item-title">提交日期</div>
+        <input id="SubmitTime" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PsychologyReplyInfo">
+        <div class="lr-form-item-title">咨询内容</div>
+        <textarea id="Concent" class="form-control" style="height:100px;" readonly></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PsychologyReplyInfo">
+        <div class="lr-form-item-title">咨询附件</div>
+        <div id="StuUrl"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PsychologyReplyInfo">
+        <div class="lr-form-item-title">最终回复人</div>
+        <div id="ReplyUser" readonly></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PsychologyReplyInfo">
+        <div class="lr-form-item-title">最终回复内容</div>
+        <textarea id="ReplyContent" class="form-control" style="height:100px;" readonly></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PsychologyReplyInfo">
+        <div class="lr-form-item-title">最终回复时间</div>
+        <input id="ReplyTime" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PsychologyReplyInfo">
+        <div class="lr-form-item-title">附件上传</div>
+        <div id="Url"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LR_Desktop/Views/PsychologyReplyInfo/FormView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/FormGatherView.js

@@ -0,0 +1,89 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-03-06 12:21
+ * 描  述：心理咨询回复
+ */
+var acceptClick;
+var PsychologyInfoId = request('PsychologyInfoId');
+var type = request('type');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            $('#ReplyUser').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_account', text: 'f_realname' });
+            $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
+            $('#IsSingle').lrDataItemSelect({ code: 'YesOrNoBit' });
+            // $('#ReplyType').lrDataItemSelect({ code: 'ReplyType' });
+            $('#ReplyType').lrselect({
+                url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailList',
+                param: { itemCode: 'ReplyType' },
+                value: 'F_ItemValue',
+                text: 'F_ItemName',
+                //select:
+                //    function (item) {
+                //        if (item) {
+                //            if (item.F_ItemValue == '1') {
+                //                //上报
+                //                $('#ReplyContent').attr('readonly', 'readonly');
+                //                $('#ReplyContent').val('');
+                //                $('#ReplyContent').prev().html('回复内容');
+                //                $('#ReplyContent').removeAttr('isvalid');
+                //            } else {
+                //                //回复
+                //                $('#ReplyContent').removeAttr('readonly');
+                //                $('#ReplyContent').prev().html('回复内容<font face="宋体">*</font>');
+                //                $('#ReplyContent').attr('isvalid', 'yes').attr('checkexpession', 'NotNull');
+                //            }
+                //        }
+                //    }
+            });
+
+
+            $('#Url').lrUploader({ isUpload: false });
+            $('#StuUrl').lrUploader({ isUpload: false });
+        },
+        initData: function () {
+            if (!!PsychologyInfoId) {
+                $.lrSetForm(top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/GetFormDataByPsychologyInfoId?PsychologyInfoId=' + PsychologyInfoId + '&type=' + type, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var strEntity = $('body').lrGetFormData();
+        strEntity.ReplyUser = learun.clientdata.get(['userinfo']).account;
+        strEntity.ReplyTime = learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss');
+        var postData = {
+            strEntity: JSON.stringify(strEntity)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/Index.js

@@ -71,7 +71,7 @@ var bootstrap = function ($, learun) {
                 var PsychologyInfoId = $('#gridtable').jfGridValue('PsychologyInfoId');
                 if (learun.checkrow(PsychologyInfoId)) {
                     learun.layerForm({
-                        id: 'formview',
+                        id: 'formview_PsychologyInfo',
                         title: '查看',
                         url: top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/FormView?PsychologyInfoId=' + PsychologyInfoId,
                         width: 800,
@@ -207,7 +207,13 @@ var bootstrap = function ($, learun) {
                     },
 
                     { label: "回复内容", name: "ReplyContent", width: 100, align: "left" },
-                    { label: "回复日期", name: "ReplyTime", width: 150, align: "left" },
+                    {
+                        label: "回复日期", name: "ReplyTime", width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            if (cellvalue != '1900-01-01 00:00:00') {
+                                return cellvalue;
+                            }
+                        } },
                     {
                         label: "状态", name: "State", width: 100, align: "left",
                         formatter: function (cellvalue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/Index3.js

@@ -71,7 +71,7 @@ var bootstrap = function ($, learun) {
                 var PsychologyInfoId = $('#gridtable').jfGridValue('PsychologyInfoId');
                 if (learun.checkrow(PsychologyInfoId)) {
                     learun.layerForm({
-                        id: 'formview',
+                        id: 'formview_PsychologyInfo3',
                         title: '查看',
                         url: top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/FormView?PsychologyInfoId=' + PsychologyInfoId + '&type=' + 3,
                         width: 800,
@@ -207,7 +207,14 @@ var bootstrap = function ($, learun) {
                     },
 
                     { label: "回复内容", name: "ReplyContent", width: 100, align: "left" },
-                    { label: "回复日期", name: "ReplyTime", width: 150, align: "left" },
+                    {
+                        label: "回复日期", name: "ReplyTime", width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            if (cellvalue != '1900-01-01 00:00:00') {
+                                return cellvalue;
+                            }
+                        }
+                    },
                     {
                         label: "状态", name: "State", width: 100, align: "left",
                         formatter: function (cellvalue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/Index4.js

@@ -71,7 +71,7 @@ var bootstrap = function ($, learun) {
                 var PsychologyInfoId = $('#gridtable').jfGridValue('PsychologyInfoId');
                 if (learun.checkrow(PsychologyInfoId)) {
                     learun.layerForm({
-                        id: 'formview',
+                        id: 'formview_PsychologyInfo4',
                         title: '查看',
                         url: top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/FormView?PsychologyInfoId=' + PsychologyInfoId + '&type=' + 4,
                         width: 800,
@@ -207,7 +207,13 @@ var bootstrap = function ($, learun) {
                     },
 
                     { label: "回复内容", name: "ReplyContent", width: 100, align: "left" },
-                    { label: "回复日期", name: "ReplyTime", width: 150, align: "left" },
+                    {
+                        label: "回复日期", name: "ReplyTime", width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            if (cellvalue != '1900-01-01 00:00:00') {
+                                return cellvalue;
+                            }
+                        } },
                     {
                         label: "状态", name: "State", width: 100, align: "left",
                         formatter: function (cellvalue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/IndexFive.js

@@ -58,7 +58,7 @@ var bootstrap = function ($, learun) {
                 var PsychologyInfoId = $('#gridtable').jfGridValue('PsychologyInfoId');
                 if (learun.checkrow(PsychologyInfoId)) {
                     learun.layerForm({
-                        id: 'formview',
+                        id: 'formview_PsychologyInfo5',
                         title: '查看',
                         url: top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/FormFiveView?PsychologyInfoId=' + PsychologyInfoId + '&type=5',
                         width: 800,
@@ -177,7 +177,13 @@ var bootstrap = function ($, learun) {
                     },
 
                     { label: "回复内容", name: "ReplyContent", width: 100, align: "left" },
-                    { label: "回复日期", name: "ReplyTime", width: 150, align: "left" },
+                    {
+                        label: "回复日期", name: "ReplyTime", width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            if (cellvalue != '1900-01-01 00:00:00') {
+                                return cellvalue;
+                            }
+                        } },
                     {
                         label: "状态", name: "State", width: 100, align: "left",
                         formatter: function (cellvalue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/IndexGather.cshtml

@@ -1,5 +1,5 @@
 @{
-    ViewBag.Title = "心理咨询回复(班级辅导员)";
+    ViewBag.Title = "心理咨询回复(汇总表)";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
 <div class="lr-layout "  >

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/IndexGather.js

@@ -2,7 +2,7 @@
  * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
  * 创建人：超级管理员
  * 日  期：2023-03-06 12:21
- * 描  述：心理咨询回复(班级辅导员)
+ * 描  述：心理咨询回复(汇总表)
  */
 var refreshGirdData;
 var bootstrap = function ($, learun) {
@@ -60,7 +60,7 @@ var bootstrap = function ($, learun) {
                     learun.layerForm({
                         id: 'formview',
                         title: '查看',
-                        url: top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/FormFiveView?PsychologyInfoId=' + PsychologyInfoId + '&type=5',
+                        url: top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/FormGatherView?PsychologyInfoId=' + PsychologyInfoId + '&type=5',
                         width: 800,
                         height: 750,
                         btn: null,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/PsychologyReplyInfo/IndexSix.js

@@ -59,7 +59,7 @@ var bootstrap = function ($, learun) {
                 var PsychologyInfoId = $('#gridtable').jfGridValue('PsychologyInfoId');
                 if (learun.checkrow(PsychologyInfoId)) {
                     learun.layerForm({
-                        id: 'formview',
+                        id: 'formview_PsychologyInfo6',
                         title: '查看',
                         url: top.$.rootUrl + '/LR_Desktop/PsychologyReplyInfo/FormView?PsychologyInfoId=' + PsychologyInfoId + '&type=' + 6,
                         width: 800,
@@ -178,7 +178,13 @@ var bootstrap = function ($, learun) {
                     },
 
                     { label: "回复内容", name: "ReplyContent", width: 100, align: "left" },
-                    { label: "回复日期", name: "ReplyTime", width: 150, align: "left" },
+                    {
+                        label: "回复日期", name: "ReplyTime", width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            if (cellvalue != '1900-01-01 00:00:00') {
+                                return cellvalue;
+                            }
+                        } },
                     {
                         label: "状态", name: "State", width: 100, align: "left",
                         formatter: function (cellvalue, row) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Form.cshtml

@@ -25,119 +25,123 @@
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">岗位工资<font face="宋体">*</font></div>
-        <input id="GangWeiGZ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="GangWeiGZ" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">薪级工资<font face="宋体">*</font></div>
-        <input id="XinJiGZ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="XinJiGZ" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">高定工资<font face="宋体">*</font></div>
-        <input id="GaoDingGZ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="GaoDingGZ" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">基础绩效<font face="宋体">*</font></div>
-        <input id="JiChuJiXiaoGZ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="JiChuJiXiaoGZ" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="SalaryInfo">
         <div class="lr-form-item-title">保留地区补贴@*及保留额*@<font face="宋体">*</font></div>
-        <input id="BaoLiuBuTie" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="BaoLiuBuTie" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">奖励性绩效<font face="宋体">*</font></div>
-        <input id="JiangLiJX" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="JiangLiJX" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="SalaryInfo">
         <div class="lr-form-item-title">艰苦边远@*地区*@津贴<font face="宋体">*</font></div>
-        <input id="JianKuJT" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="JianKuJT" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">南疆工作补贴<font face="宋体">*</font></div>
-        <input id="NanJiangBT" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="NanJiangBT" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">教护龄津贴<font face="宋体">*</font></div>
-        <input id="JiaoHuLingJT" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="JiaoHuLingJT" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">核增绩效工资<font face="宋体">*</font></div>
-        <input id="HeZengJX" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="HeZengJX" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">班主任补贴<font face="宋体">*</font></div>
-        <input id="BanZhuRenBT" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="BanZhuRenBT" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">补发基本工资<font face="宋体">*</font></div>
-        <input id="BuFaGZ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="BuFaGZ" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">补发津补贴<font face="宋体">*</font></div>
-        <input id="BuFaJT" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="BuFaJT" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">补发绩效工资<font face="宋体">*</font></div>
-        <input id="BuFaJX" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="BuFaJX" type="number" class="form-control" isvalid="yes"  />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">补发其它津补@*贴*@<font face="宋体">*</font></div>
-        <input id="BuFaQTJT" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="BuFaQTJT" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">补发其它工资<font face="宋体">*</font></div>
-        <input id="BuFaQTGZ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="BuFaQTGZ" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">基础绩效奖<font face="宋体">*</font></div>
-        <input id="JiChuJX" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="JiChuJX" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">补发奖励@*性*@绩效<font face="宋体">*</font></div>
-        <input id="BuFaJiangLiJX" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="BuFaJiangLiJX" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">应发工资<font face="宋体">*</font></div>
-        <input id="YingFaGZ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="YingFaGZ" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">个人所得税<font face="宋体">*</font></div>
-        <input id="GeRenSDS" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="GeRenSDS" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">预扣保险年金<font face="宋体">*</font></div>
-        <input id="YuKouBXNJ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="YuKouBXNJ" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">住房公积金<font face="宋体">*</font></div>
-        <input id="ZhuFangGJJ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="ZhuFangGJJ" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">养老保险<font face="宋体">*</font></div>
-        <input id="YangLaoBX" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="YangLaoBX" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">医疗保险<font face="宋体">*</font></div>
-        <input id="YiLiaoBX" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="YiLiaoBX" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">职业年金<font face="宋体">*</font></div>
-        <input id="ZhiYeNJ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="ZhiYeNJ" type="number" class="form-control" isvalid="yes"/>
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">失业保险金<font face="宋体">*</font></div>
-        <input id="ShiYeBXJ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="ShiYeBXJ" type="number" class="form-control" isvalid="yes"  />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">大额医疗互助<font face="宋体">*</font></div>
-        <input id="YiLiao" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="YiLiao" type="number" class="form-control" isvalid="yes" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
+        <div class="lr-form-item-title">病事假扣款<font face="宋体">*</font></div>
+        <input id="BingShiJiaKK" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">扣发工资<font face="宋体">*</font></div>
-        <input id="KouFaGZ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="KouFaGZ" type="number" class="form-control" isvalid="yes" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="SalaryInfo" >
         <div class="lr-form-item-title">实发工资<font face="宋体">*</font></div>
-        <input id="ShiFaGZ" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="ShiFaGZ" type="number" class="form-control" isvalid="yes"  />
     </div>
 </div>
 @Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Index.js

@@ -136,6 +136,7 @@ var bootstrap = function ($, learun) {
                 { label: "职业年金", name: "ZhiYeNJ", width: 100, align: "left" },
                 { label: "失业保险金", name: "ShiYeBXJ", width: 100, align: "left" },
                 { label: "大额医疗互助", name: "YiLiao", width: 100, align: "left" },
+                { label: "病事假扣款", name: "BingShiJiaKK", width: 100, align: "left" },
                 { label: "扣发工资", name: "KouFaGZ", width: 100, align: "left" },
                 { label: "实发工资", name: "ShiFaGZ", width: 100, align: "left" },
                 ],

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/IndexPersonal.cshtml

@@ -2,7 +2,7 @@
     ViewBag.Title = "个人工资条";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
-<div class="lr-layout "  >
+<div class="lr-layout ">
     <div class="lr-layout-center">
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
@@ -10,10 +10,10 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">部门</div>
-                                    <div id="F_DepartmentId"></div>
-                                </div>
+                                @*<div class="col-xs-12 lr-form-item">
+                                        <div class="lr-form-item-title">部门</div>
+                                        <div id="F_DepartmentId"></div>
+                                    </div>*@
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">年度</div>
                                     <div id="YearNo"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/IndexPersonal.js

@@ -136,6 +136,7 @@ var bootstrap = function ($, learun) {
                 { label: "职业年金", name: "ZhiYeNJ", width: 100, align: "left" },
                 { label: "失业保险金", name: "ShiYeBXJ", width: 100, align: "left" },
                 { label: "大额医疗互助", name: "YiLiao", width: 100, align: "left" },
+                { label: "病事假扣款", name: "BingShiJiaKK", width: 100, align: "left" },
                 { label: "扣发工资", name: "KouFaGZ", width: 100, align: "left" },
                 { label: "实发工资", name: "ShiFaGZ", width: 100, align: "left" },
                 ],

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -1518,6 +1518,7 @@
     <Content Include="Areas\LR_Desktop\Views\PsychologyReplyInfo\FormFiveView.js" />
     <Content Include="Areas\LR_Desktop\Views\PsychologyReplyInfo\FormSix.js" />
     <Content Include="Areas\LR_Desktop\Views\PsychologyReplyInfo\FormFive.js" />
+    <Content Include="Areas\LR_Desktop\Views\PsychologyReplyInfo\FormGatherView.js" />
     <Content Include="Areas\LR_Desktop\Views\PsychologyReplyInfo\FormView.js" />
     <Content Include="Areas\LR_Desktop\Views\PsychologyReplyInfo\Index4.js" />
     <Content Include="Areas\LR_Desktop\Views\PsychologyReplyInfo\IndexGather.js" />
@@ -8120,6 +8121,7 @@
     <Content Include="Areas\StudentWork\Views\FamilyEconomy\IndexOfThree.cshtml" />
     <Content Include="Areas\StudentWork\Views\FamilyEconomy\IndexOfStudent.cshtml" />
     <Content Include="Areas\LR_Desktop\Views\PsychologyReplyInfo\IndexGather.cshtml" />
+    <Content Include="Areas\LR_Desktop\Views\PsychologyReplyInfo\FormGatherView.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js

@@ -317,6 +317,7 @@
                         shade: [0],
                         area: ['340px', '215px'],
                         offset: 'rb', //右下角弹出
+                        scrollbar:true,
                         anim: 2,
                         content: top.$.rootUrl + '/LR_Desktop/MessageRind/UnreadIndex',
                         callBack: function (id) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml

@@ -512,7 +512,7 @@
                                             }
                                         });
                                         return result;
-                                    }, 
+                                    },
                                     HighestRecordNo: function (value) {
                                         var result;
                                         top.learun.clientdata.getAsync('dataItem', {
@@ -777,6 +777,7 @@
                     <iframe class="lr-layout-iframe" frameborder="0" src="~/UserCenter/LanguageForm"></iframe>
                 </div>
             </div>
+            <audio id="sound" autoplay="autoplay"></audio>
         </div>
     </div>
 </div>
@@ -790,7 +791,8 @@
         if ('@ViewBag.UserType' == '学生') {
             $("#lr_left_list").children('li').eq(4).addClass("active");
             $('.lr-layout-wrap-item').eq(5).addClass("active");
-
+            funopen();
+            window.setInterval(funopen, 60000);
         } else {
             $("#lr_left_list").children('li').eq(0).addClass("active");
             $('.lr-layout-wrap-item').eq(0).addClass("active");
@@ -823,6 +825,37 @@
                         });
 
                 }
-            });
+    });
+
+
+    //消息提醒
+    function funopen() {
+        $.ajax({
+            url: top.$.rootUrl + '/LR_Desktop/MessageRind/GetCountForUnread',
+            type: "get",
+            dataType: "json",
+            async: false,
+            success: function (data) {
+                if (data.data != 0) {
+                    document.getElementById("sound").src = '/Resource/wav/收到新消息.wav';
+                    top.learun.layeropen({
+                        //id: 'form',
+                        type: 2,
+                        title: "消息提示",
+                        closeBtn: 0, //不显示关闭按钮
+                        shade: [0],
+                        area: ['340px', '215px'],
+                        offset: 'rb', //右下角弹出
+                        scrollbar: true,
+                        anim: 2,
+                        content: top.$.rootUrl + '/LR_Desktop/MessageRind/UnreadIndex',
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            }
+        });
+    };
 </script>
 @Html.AppendJsFile("/Views/UserCenter/IndexForDC.js")

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_Desktop/PsychologyReadInfoMap.cs

@@ -0,0 +1,30 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using Learun.Application.TwoDevelopment.LR_Desktop;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2023-03-06 12:21
+    /// 描 述：心理咨询阅读提醒
+    /// </summary>
+    public class PsychologyReadInfoMap : EntityTypeConfiguration<PsychologyReadInfo>
+    {
+        public PsychologyReadInfoMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("PSYCHOLOGYREADINFO");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj

@@ -143,6 +143,7 @@
     <Compile Include="LR_CRM\CrmChanceMap.cs" />
     <Compile Include="LR_Desktop\LostArticleInfoMap.cs" />
     <Compile Include="LR_Desktop\MessageRemindMap.cs" />
+    <Compile Include="LR_Desktop\PsychologyReadInfoMap.cs" />
     <Compile Include="LR_Desktop\SSO_Drag_CardSortManageMap.cs" />
     <Compile Include="LR_Desktop\SSO_Drag_DesktopManageMap.cs" />
     <Compile Include="LR_Desktop\WeChatDevelopMap.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/ArrangeExamTermNewEntity.cs

@@ -89,6 +89,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
         #endregion
         #region 扩展字段
+
+        [NotMapped]
+        public string AcademicYearNo { get; set; }
+        [NotMapped]
+        public string Semester { get; set; }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs

@@ -167,7 +167,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
-
         /// <summary>
         /// 获取页面显示列表数据
         /// </summary>
@@ -180,18 +179,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.EPIId,
-                t.LessonNo,
-                t.LessonName,
-                t.ExamDate,
-                t.ExamTime,
-                t.EmpNo,
-                t.EmpName,
-                t.ClassroomNo,
-                t.ClassroomName
-                ");
-                strSql.Append("  FROM Exam_ArrangeExamTermNew t ");
+                strSql.Append(@" t.*,e.AcademicYearNo,e.Semester ");
+                strSql.Append("  FROM Exam_ArrangeExamTermNew t join Exam_ExamPlan e on t.EPId=e.EPId ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
@@ -231,6 +220,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("ClassroomName", "%" + queryParam["ClassroomName"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.ClassroomName Like @ClassroomName ");
                 }
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
+                {
+                    strSql.Append(" AND ( ExamDate >= '" + queryParam["StartTime"].ToString() + "' AND ExamDate <= '" + queryParam["EndTime"].ToString() + "' ) ");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Exam_ArrangeExamTermNewEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
@@ -246,6 +239,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+
+
+
         /// <summary>
         /// 获取ArrangeExamTermNew表实体数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanService.cs

@@ -384,7 +384,7 @@ delete from  Exam_ExamPlanRoom where EPLId in ('{planLessonIds}');");
                             item.EmpNo = planRoom.EmpNo;
                             item.ClassroomName = planRoom.ClassroomName;
                             item.ClassroomNo = planRoom.ClassroomNo;
-                            item.F_SchoolId = LoginUserInfo.Get().userId;
+                            item.F_SchoolId = LoginUserInfo.Get().companyId;
                             item.SitNumber = sealNumArr[n].ToString().PadLeft(3, '0');
                             itemList.Add(item);
                         }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherService.cs

@@ -173,7 +173,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindList<Exam_InvigilateTeacherEntity>(x => x.AcademicYearNo == AcademicYearNo && x.Semester == Semester);
+                return this.BaseRepository("CollegeMIS").FindList<Exam_InvigilateTeacherEntity>(x => x.AcademicYearNo == AcademicYearNo && x.Semester == Semester && x.ITEnabled == true);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PsychologyInfo/PsychologyInfoEntity.cs

@@ -82,7 +82,97 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         public DateTime? ReplyTime { get; set; }
         [NotMapped]
         public string ReplyUser { get; set; }
+        [NotMapped]
+        public int? IsReply { get; set; }
+        [NotMapped]
+        public string Description { get; set; }
+
+
+    }
+
+    /// <summary>
+    /// 心理咨询阅读表
+    /// </summary>
+    public class PsychologyReadInfo
+    {
+        #region 实体成员
+        /// <summary>
+        /// Id
+        /// </summary>
+        /// <returns></returns>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 心理预约表主键
+        /// </summary>
+        /// <returns></returns>
+        [Column("PSYCHOLOGYINFOID")]
+        public string PsychologyInfoId { get; set; }
+        /// <summary>
+        /// 状态
+        /// </summary>
+        /// <returns></returns>
+        [Column("State")]
+        public int? State { get; set; }
+        /// <summary>
+        /// 回复人/阅读人
+        /// </summary>
+        /// <returns></returns>
+        [Column("ACCOUNT")]
+        public string Account { get; set; }
+        /// <summary>
+        /// 是否需要回复
+        /// </summary>
+        /// <returns></returns>
+        [Column("ISREPLY")]
+        public int? IsReply { get; set; }
+        /// <summary>
+        /// 数据归档后是否已阅读
+        /// </summary>
+        /// <returns></returns>
+        [Column("ISREAD")]
+        public int? IsRead { get; set; }
+        /// <summary>
+        /// 描述
+        /// </summary>
+        /// <returns></returns>
+        [Column("DESCRIPTION")]
+        public string Description { get; set; }
+        /// <summary>
+        /// 创建日期
+        /// </summary>
+        /// <returns></returns>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        /// <returns></returns>
+        [Column("CREATEUSER")]
+        public string CreateUser { get; set; }
+        #endregion
 
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.Id = Guid.NewGuid().ToString();
+            this.CreateTime = DateTime.Now;
+            this.CreateUser = LoginUserInfo.Get().account;
+            this.IsReply = 0;
+            this.IsRead = 0;
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.Id = keyValue;
+        }
+        #endregion
 
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PsychologyInfo/PsychologyInfoService.cs

@@ -224,8 +224,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var entity = db.FindEntity<PsychologyInfoEntity>(keyValue);
                 entity.State = 2;
                 db.Update(entity);
+                //添加回复表数据
                 db.ExecuteBySql(@"INSERT INTO PsychologyReplyInfo(Id, PsychologyInfoId, State, ReplyContent, ReplyType, Url, ReplyUser, ReplyTime, CreateTime)
                 VALUES('" + Guid.NewGuid().ToString() + "', '" + keyValue + "', '2', '', '', '', '',NUll, '" + DateTime.Now + "') ");
+                
+                //添加消息提醒阅读表数据
+                var account = LoginUserInfo.Get().account;
+                //查询当前学生辅导员
+                var classinfo = db.FindList<ClassInfoEntity>($"select t.* from classinfo t join StuInfoBasic stu on t.classno=stu.ClassNo and stu.StuNo='{account}'").FirstOrDefault();
+                if (classinfo != null && !string.IsNullOrEmpty(classinfo.ClassTutorNo))
+                {
+                    PsychologyReadInfo model = new PsychologyReadInfo();
+                    model.Create();
+                    model.PsychologyInfoId = keyValue;
+                    model.State = entity.State;
+                    model.Account = classinfo.ClassTutorNo;
+                    model.Description = "教师";
+                    db.Insert(model);
+                }
                 db.Commit();
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassBLL.cs

@@ -258,11 +258,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 课程下拉框信息
         /// </summary>
         /// <returns></returns>
-        public IEnumerable<WebHelper.YearGrade> GetLessonNoDataOfAll(string userAccount, string userType)
+        public IEnumerable<WebHelper.YearGrade> GetLessonNoDataOfAll(string userAccount, string userType, string AcademicYearNo, string Semester)
         {
             try
             {
-                return stuScoreNotPassService.GetLessonNoDataOfAll(userAccount, userType);
+                return stuScoreNotPassService.GetLessonNoDataOfAll(userAccount, userType, AcademicYearNo, Semester);
             }
             catch (Exception ex)
             {
@@ -277,15 +277,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+
         /// <summary>
         /// 班级下拉框信息
         /// </summary>
         /// <returns></returns>
-        public IEnumerable<WebHelper.YearGrade> GetClassNoData(string userAccount, string userType, string lessonNo)
+        public IEnumerable<WebHelper.YearGrade> GetClassNoData(string userAccount, string userType, string lessonNo, string AcademicYearNo, string Semester)
         {
             try
             {
-                return stuScoreNotPassService.GetClassNoData(userAccount, userType, lessonNo);
+                return stuScoreNotPassService.GetClassNoData(userAccount, userType, lessonNo, AcademicYearNo, Semester);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassIBLL.cs

@@ -77,13 +77,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 课程下拉框信息
         /// </summary>
         /// <returns></returns>
-        IEnumerable<WebHelper.YearGrade> GetLessonNoDataOfAll(string userAccount, string userType);
+        IEnumerable<WebHelper.YearGrade> GetLessonNoDataOfAll(string userAccount, string userType, string AcademicYearNo, string Semester);
 
         /// <summary>
         /// 班级下拉框信息
         /// </summary>
         /// <returns></returns>
-        IEnumerable<WebHelper.YearGrade> GetClassNoData(string userAccount, string userType, string lessonNo);
+        IEnumerable<WebHelper.YearGrade> GetClassNoData(string userAccount, string userType, string lessonNo, string AcademicYearNo, string Semester);
 
         /// <summary>
         /// 开始录入：占用成绩

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScoreNotPass/StuScoreNotPassService.cs

@@ -517,7 +517,7 @@ order by bb.ScoreId";
         /// 课程下拉框信息
         /// </summary>
         /// <returns></returns>
-        public IEnumerable<WebHelper.YearGrade> GetLessonNoDataOfAll(string userAccount, string userType)
+        public IEnumerable<WebHelper.YearGrade> GetLessonNoDataOfAll(string userAccount, string userType, string AcademicYearNo, string Semester)
         {
             try
             {
@@ -529,6 +529,10 @@ order by bb.ScoreId";
                 {
                     strSql.Append(" and s.EmpNo='" + userAccount + "' ");
                 }
+                if (!string.IsNullOrEmpty(AcademicYearNo) && !string.IsNullOrEmpty(Semester))
+                {
+                    strSql.Append($"  and s.AcademicYearNo='{AcademicYearNo}' and s.Semester='{Semester}' ");
+                }
                 var data = this.BaseRepository("CollegeMIS").FindList<WebHelper.YearGrade>(strSql.ToString());
                 data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value);
                 return data;
@@ -550,7 +554,7 @@ order by bb.ScoreId";
         /// 班级下拉框信息
         /// </summary>
         /// <returns></returns>
-        public IEnumerable<WebHelper.YearGrade> GetClassNoData(string userAccount, string userType, string lessonNo)
+        public IEnumerable<WebHelper.YearGrade> GetClassNoData(string userAccount, string userType, string lessonNo, string AcademicYearNo, string Semester)
         {
             try
             {
@@ -564,6 +568,10 @@ order by bb.ScoreId";
                 {
                     strSql.Append(" and s.LessonNo='" + lessonNo + "' ");
                 }
+                if (!string.IsNullOrEmpty(AcademicYearNo) && !string.IsNullOrEmpty(Semester))
+                {
+                    strSql.Append($"  and s.AcademicYearNo='{AcademicYearNo}' and s.Semester='{Semester}' ");
+                }
                 var data = this.BaseRepository("CollegeMIS").FindList<WebHelper.YearGrade>(strSql.ToString());
                 data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value);
                 return data;

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindService.cs

@@ -1,4 +1,5 @@
 using Dapper;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
 using Learun.DataBase.Repository;
 using Learun.Util;
 using System;
@@ -99,10 +100,44 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
                 sql += $"  and ReceiptId='{userInfo.userId}'";
 
                 var obj = this.BaseRepository().FindObject(sql);
-                if (obj == null)
-                    return 0;
-                else
+                if (obj != null && Convert.ToInt32(obj) > 0)
+                {
                     return Convert.ToInt32(obj);
+                }
+                else
+                {
+                    if (userInfo.Description.Trim() != "学生")
+                    {
+                        //2023.3.27  心理咨询数据加入消息提醒，显示已归档的数据、待当前用户回复的数据、当前用户已回复过的或当前用户所在角色已回复过的
+                        //查询心理咨询数据
+                        var roles = userInfo.roleIds;
+                        if (!roles.Contains("2f52a949-4e71-4ad5-8cc5-edc2d89f85cc") && !roles.Contains("6a8e92d5-d135-4937-9fcb-5b84434cb18a") && !roles.Contains("8596cacc-8232-41a2-aa13-d039cc22a56e") && !roles.Contains("e443f997-dc6c-4bb0-998a-534163c852f6") && !roles.Contains("29cf249b-8582-4016-975c-ca7668acc19f"))
+                        {
+                            return 0;
+                        }
+                            string pSql = $@" select count(a.id) from PsychologyReadInfo t 
+join PsychologyInfo a on t.PsychologyInfoId=a.Id
+where t.IsRead=0 and [Description]='教师' and t.Account='{userInfo.account}'";
+                            var count = this.BaseRepository("CollegeMIS").FindObject(pSql);
+                            if (count != null && Convert.ToInt32(count) > 0)
+                            {
+                                return Convert.ToInt32(count);
+                            }
+                            else return 0;
+                    }
+                    else
+                    {
+                        //学生显示已归档的
+                        var obj_stu = this.BaseRepository("CollegeMIS").FindObject($@" select count(a.id) from PsychologyReadInfo t
+join PsychologyInfo a on t.PsychologyInfoId = a.Id
+where t.IsRead = 0 and [Description] = '学生' and a.[state] = 7 and t.Account = '{userInfo.account}'");
+                        if (obj_stu != null)
+                        {
+                            return Convert.ToInt32(obj_stu);
+                        }
+                        else return 0;
+                    }
+                }
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/PsychologyReplyInfo/PsychologyReplyInfoBLL.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Data;
 using System.Collections.Generic;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
 
 namespace Learun.Application.TwoDevelopment.LR_Desktop
 {
@@ -67,7 +68,24 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
                 }
             }
         }
-
+        public List<PsychologyInfoEntity> GetListForUnread()
+        {
+            try
+            {
+                return psychologyReplyInfoService.GetListForUnread();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 获取PsychologyReplyInfo表实体数据
         /// </summary>
@@ -113,7 +131,24 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
         #endregion
 
         #region 提交数据
-
+        public void UpdateEntity(string keyValue)
+        {
+            try
+            {
+                psychologyReplyInfoService.UpdateEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 删除实体数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/PsychologyReplyInfo/PsychologyReplyInfoIBLL.cs

@@ -1,6 +1,7 @@
 using Learun.Util;
 using System.Data;
 using System.Collections.Generic;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
 
 namespace Learun.Application.TwoDevelopment.LR_Desktop
 {
@@ -22,6 +23,8 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
         /// <returns></returns>
         IEnumerable<PsychologyReplyInfoEntity> GetPageList(Pagination pagination, string queryJson, int type);
         IEnumerable<PsychologyReplyInfoEntity> GetPageList2(Pagination pagination, string queryJson, int type);
+
+        List<PsychologyInfoEntity> GetListForUnread();
         /// <summary>
         /// 获取PsychologyReplyInfo表实体数据
         /// </summary>
@@ -32,7 +35,7 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
         #endregion
 
         #region 提交数据
-
+        void UpdateEntity(string keyValue);
         /// <summary>
         /// 删除实体数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/PsychologyReplyInfo/PsychologyReplyInfoService.cs

@@ -133,7 +133,7 @@ s.StuNo,s.StuName,info.createtime as SubmitTime,s.DeptNo,s.MajorNo,s.ClassNo,s.I
 union 
 SELECT distinct 
 s.StuNo,s.StuName,info.createtime as SubmitTime,s.DeptNo,s.MajorNo,s.ClassNo,s.IdentityCardNo,s.IsSingle,info.Concent,a.Id,a.Appointor
-,'' as ReplyUser,'' as ReplyContent,'' as ReplyTime,info.[state],info.id as PsychologyInfoId  FROM PsychologyInfo info  
+,'' as ReplyUser,'' as ReplyContent,NULL as ReplyTime,info.[state],info.id as PsychologyInfoId  FROM PsychologyInfo info  
   join StuInfoBasic s on info.StuNo=s.StuNo
   join (select * from PsychologyReplyInfo where [state]={type} and PsychologyInfoId in (select PsychologyInfoId from PsychologyReplyInfo group by PsychologyInfoId having MAX([state])={type})) a on  a.PsychologyInfoid=info.id
  WHERE 1=1 and  info.[state]>=2 and info.[state]<7 
@@ -287,6 +287,79 @@ where a.Id='{keyValue}'";
                 }
             }
         }
+
+        /// <summary>
+        /// 获取允许当前用户查看的心理咨询数据，加入消息提醒
+        /// </summary>
+        /// <returns></returns>
+        public List<PsychologyInfoEntity> GetListForUnread()
+        {
+            try
+            {
+                var userInfo = LoginUserInfo.Get();
+                var list = new List<PsychologyInfoEntity>();
+                if (userInfo.Description.Trim() != "学生")
+                {
+                    //2023.3.27  心理咨询数据加入消息提醒，显示已归档的数据、待当前用户回复的数据、当前用户已回复过的或当前用户所在角色已回复过的
+                    //查询心理咨询数据
+                    var roles = userInfo.roleIds;
+                    if (!roles.Contains("2f52a949-4e71-4ad5-8cc5-edc2d89f85cc") && !roles.Contains("6a8e92d5-d135-4937-9fcb-5b84434cb18a") && !roles.Contains("8596cacc-8232-41a2-aa13-d039cc22a56e") && !roles.Contains("e443f997-dc6c-4bb0-998a-534163c852f6") && !roles.Contains("29cf249b-8582-4016-975c-ca7668acc19f"))
+                    {
+                        return list;
+                    }
+                    string pSql = $@" select t.*,a.Concent from PsychologyReadInfo t 
+join PsychologyInfo a on t.PsychologyInfoId=a.Id
+where t.IsRead=0 and [Description]='教师' and t.Account='{userInfo.account}'";
+                    return this.BaseRepository("CollegeMIS").FindList<PsychologyInfoEntity>(pSql).ToList();
+                }
+                else
+                {
+                    string pSql = $@" select t.*,a.Concent from PsychologyReadInfo t 
+join PsychologyInfo a on t.PsychologyInfoId=a.Id
+where t.IsRead=0 and [Description]='学生' and a.[state]=7 and t.Account='{userInfo.account}'";
+                    return this.BaseRepository("CollegeMIS").FindList<PsychologyInfoEntity>(pSql).ToList();
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// 心理咨询阅读改为已读
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void UpdateEntity(string keyValue)
+        {
+            try
+            {
+                var entity = this.BaseRepository("CollegeMIS").FindEntity<PsychologyReadInfo>(keyValue);
+                if (entity.IsReply == 1)
+                {
+                    this.BaseRepository("CollegeMIS").ExecuteBySql($"update PsychologyReadInfo set IsRead=1 where Id='{keyValue}'");
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         #endregion
 
         #region 提交数据
@@ -325,11 +398,21 @@ where a.Id='{keyValue}'";
             try
             {
                 db.BeginTrans();
+                var basedbname = BaseRepository().getDbConnection().Database;
+                var userInfo = LoginUserInfo.Get();
+
                 if (!string.IsNullOrEmpty(keyValue))
                 {
                     entity.Modify(keyValue);
                     var model = this.BaseRepository("CollegeMIS").FindEntity<PsychologyReplyInfoEntity>(keyValue);
                     var psychologyInfoId = model.PsychologyInfoId;
+                    var psychologyInfo = this.BaseRepository("CollegeMIS").FindEntity<PsychologyInfoEntity>(psychologyInfoId);
+
+                    //学生信息
+                    var stuInfoBasic = db.FindList<StuInfoBasicEntity>($@"select s.* from PsychologyInfo info
+join StuInfoBasic s on info.StuNo=s.StuNo 
+ where s.stuno='{psychologyInfo.StuNo}'").FirstOrDefault();
+
                     if (entity.ReplyType == "1")
                     {
                         int state = 0;
@@ -363,6 +446,139 @@ where a.Id='{keyValue}'";
                         //修改主表state
                         var updSql = $" update PsychologyInfo set [state]='{state}' where Id='{psychologyInfoId}'";
                         db.ExecuteBySql(updSql);
+
+                        #region 操作阅读表
+                        /*
+                      1.删除当前用户（和当前角色其他人）待回复提醒数据
+                      2.添加下一步用户待回复提醒
+                      */
+                        db.ExecuteBySql($@"delete from PsychologyReadInfo where  PsychologyInfoId='{psychologyInfoId}' and [State]='{model.State}' ");
+
+                        //班级辅导员上报，添加分院心理辅导站负责人提醒
+                        if (psychologyInfo.State == 2)
+                        {
+                            //分院心理辅导站负责人
+                            var empInfo = db.FindList<EmpInfoEntity>($@"select a.* from {basedbname}.dbo.LR_Base_UserRelation t
+join {basedbname}.dbo.lr_base_user u on t.f_userid=u.f_userid
+join empinfo a on u.f_account=a.empno
+ where t.f_objectId='6a8e92d5-d135-4937-9fcb-5b84434cb18a' and a.deptno='{stuInfoBasic.DeptNo}' ");
+
+                            foreach (var item in empInfo)
+                            {
+                                db.ExecuteBySql($@"INSERT INTO [dbo].[PsychologyReadInfo]
+           ([Id]
+           ,[PsychologyInfoId]
+           ,[State]
+           ,[Account]
+           ,[IsReply]
+           ,[IsRead]
+           ,[Description]
+           ,[CreateTime]
+           ,[CreateUser])
+     VALUES
+           (newid()
+           ,'{psychologyInfoId}'
+           ,'{state}'
+           ,'{item.EmpNo}'
+           ,0
+           ,0
+           ,'教师'
+           ,GETDATE()
+           ,'{userInfo.account}')");
+                            }
+                        }
+
+                        //分院心理辅导站负责人上报，添加学工处心理老师提醒
+                        if (psychologyInfo.State == 3)
+                        {
+                            var empInfo = db.FindList<EmpInfoEntity>($@"select a.* from {basedbname}.dbo.LR_Base_UserRelation t
+join {basedbname}.dbo.lr_base_user u on t.f_userid=u.f_userid
+join empinfo a on u.f_account=a.empno
+ where t.f_objectId='8596cacc-8232-41a2-aa13-d039cc22a56e'  ");
+
+                            foreach (var item in empInfo)
+                            {
+                                db.ExecuteBySql($@"INSERT INTO [dbo].[PsychologyReadInfo]
+           ([Id]
+           ,[PsychologyInfoId]
+           ,[State]
+           ,[Account]
+           ,[IsReply]
+           ,[IsRead]
+           ,[Description]
+           ,[CreateTime]
+           ,[CreateUser])
+     VALUES
+           (newid()
+           ,'{psychologyInfoId}'
+           ,'{state}'
+           ,'{item.EmpNo}'
+           ,0
+           ,0
+           ,'教师'
+           ,GETDATE()
+           ,'{userInfo.account}')");
+                            }
+                        }
+
+                        //学工处心理老师上报，添加心理总站负责人（徐启东老师）提醒
+                        if (psychologyInfo.State == 4)
+                        {
+                            var empInfo = db.FindList<EmpInfoEntity>($@"select a.* from {basedbname}.dbo.LR_Base_UserRelation t
+join {basedbname}.dbo.lr_base_user u on t.f_userid=u.f_userid
+join empinfo a on u.f_account=a.empno
+ where t.f_objectId='e443f997-dc6c-4bb0-998a-534163c852f6'  ");
+
+                            foreach (var item in empInfo)
+                            {
+                                db.ExecuteBySql($@"INSERT INTO [dbo].[PsychologyReadInfo]
+           ([Id]
+           ,[PsychologyInfoId]
+           ,[State]
+           ,[Account]
+           ,[IsReply]
+           ,[IsRead]
+           ,[Description]
+           ,[CreateTime]
+           ,[CreateUser])
+     VALUES
+           (newid()
+           ,'{psychologyInfoId}'
+           ,'{state}'
+           ,'{item.EmpNo}'
+           ,0
+           ,0
+           ,'教师'
+           ,GETDATE()
+           ,'{userInfo.account}')");
+                            }
+                        }
+                        //心理总站负责人（徐启东老师）上报，添加指派的心理老师提醒
+                        if (psychologyInfo.State == 5 && !string.IsNullOrEmpty(entity.Appointor))
+                        {
+                            db.ExecuteBySql($@"INSERT INTO [dbo].[PsychologyReadInfo]
+           ([Id]
+           ,[PsychologyInfoId]
+           ,[State]
+           ,[Account]
+           ,[IsReply]
+           ,[IsRead]
+           ,[Description]
+           ,[CreateTime]
+           ,[CreateUser])
+     VALUES
+           (newid()
+           ,'{psychologyInfoId}'
+           ,'{state}'
+           ,'{entity.Appointor}'
+           ,0
+           ,0
+           ,'教师'
+           ,GETDATE()
+           ,'{userInfo.account}')");
+                        }
+
+                        #endregion
                     }
 
                     if (entity.ReplyType == "2")//回复
@@ -391,6 +607,183 @@ where a.Id='{keyValue}'";
                         //修改主表state
                         var updSql = $" update PsychologyInfo set [state]='7' where Id='{psychologyInfoId}'";
                         db.ExecuteBySql(updSql);
+
+
+                        #region 操作阅读表
+                        /*
+                         1.修改当前角色下阅读者状态
+                         2.已归档后通知学生查看
+                         3.通知之前步骤的老师和当前步骤角色中的其他老师
+                           1)班级辅导员回复（state=2）时，不需要通知其他老师，只需通知学生；
+                           2)分院心理辅导站负责人回复（state=3）时，通知班级辅导员和该角色其他负责人；
+                           3)学工处心理老师回复（state=4）时，通知班级辅导员、分院心理辅导站负责人、该角色其他老师；
+                           以此类推...
+                         */
+                        #region 修改阅读表状态
+                        //修改阅读表为已回复已读(当前用户已回复已读，角色下其他人已回复未读)
+                        db.ExecuteBySql($"update PsychologyReadInfo set IsReply=1,IsRead=1 where  PsychologyInfoId='{psychologyInfoId}' and [State]='{psychologyInfo.State}' and Account='{userInfo.account}'");
+                        db.ExecuteBySql($"update PsychologyReadInfo set IsReply=1,IsRead=0 where  PsychologyInfoId='{psychologyInfoId}' and [State]='{psychologyInfo.State}' and Account<>'{userInfo.account}'");
+                        #endregion
+
+                        #region 添加学生阅读提醒
+                        //学生
+                        db.ExecuteBySql($@"INSERT INTO [dbo].[PsychologyReadInfo]
+           ([Id]
+           ,[PsychologyInfoId]
+           ,[State]
+           ,[Account]
+           ,[IsReply]
+           ,[IsRead]
+           ,[Description]
+           ,[CreateTime]
+           ,[CreateUser])
+     VALUES
+           (newid()
+           ,'{psychologyInfoId}'
+           ,7
+           ,'{psychologyInfo.StuNo}'
+           ,1
+           ,0
+           ,'学生'
+           ,GETDATE()
+           ,'{userInfo.account}')");
+
+                        #endregion
+
+                        #region 添加老师阅读提醒
+                        if (psychologyInfo.State >= 3)
+                        {
+                            //班级辅导员
+                            var classinfo = db.FindList<ClassInfoEntity>($@"select class.* from PsychologyInfo info
+join StuInfoBasic s on info.StuNo=s.StuNo 
+left join classinfo class on s.classno=class.classno
+ where s.stuno='{psychologyInfo.StuNo}'").FirstOrDefault();
+
+                            db.ExecuteBySql($@"INSERT INTO [dbo].[PsychologyReadInfo]
+           ([Id]
+           ,[PsychologyInfoId]
+           ,[State]
+           ,[Account]
+           ,[IsReply]
+           ,[IsRead]
+           ,[Description]
+           ,[CreateTime]
+           ,[CreateUser])
+     VALUES
+           (newid()
+           ,'{psychologyInfoId}'
+           ,'2'
+           ,'{classinfo.ClassTutorNo}'
+           ,1
+           ,0
+           ,'教师'
+           ,GETDATE()
+           ,'{userInfo.account}')");
+
+                        }
+                        if (psychologyInfo.State >= 4)
+                        {
+                            //分院心理辅导站负责人
+                            var empInfo = db.FindList<EmpInfoEntity>($@"select a.* from {basedbname}.dbo.LR_Base_UserRelation t
+join {basedbname}.dbo.lr_base_user u on t.f_userid=u.f_userid
+join empinfo a on u.f_account=a.empno
+ where t.f_objectId='6a8e92d5-d135-4937-9fcb-5b84434cb18a' and deptno='{stuInfoBasic.DeptNo}'");
+
+                            foreach (var item in empInfo)
+                            {
+                                db.ExecuteBySql($@"INSERT INTO [dbo].[PsychologyReadInfo]
+           ([Id]
+           ,[PsychologyInfoId]
+           ,[State]
+           ,[Account]
+           ,[IsReply]
+           ,[IsRead]
+           ,[Description]
+           ,[CreateTime]
+           ,[CreateUser])
+     VALUES
+           (newid()
+           ,'{psychologyInfoId}'
+           ,'3'
+           ,'{item.EmpNo}'
+           ,1
+           ,0
+           ,'教师'
+           ,GETDATE()
+           ,'{userInfo.account}')");
+                            }
+
+                        }                     
+                        if (psychologyInfo.State >= 5)
+                        {
+                            //学工处心理老师
+                            var empInfo = db.FindList<EmpInfoEntity>($@"select a.* from {basedbname}.dbo.LR_Base_UserRelation t
+join {basedbname}.dbo.lr_base_user u on t.f_userid=u.f_userid
+join empinfo a on u.f_account=a.empno
+ where t.f_objectId='8596cacc-8232-41a2-aa13-d039cc22a56e' ");
+
+                            foreach (var item in empInfo)
+                            {
+                                db.ExecuteBySql($@"INSERT INTO [dbo].[PsychologyReadInfo]
+           ([Id]
+           ,[PsychologyInfoId]
+           ,[State]
+           ,[Account]
+           ,[IsReply]
+           ,[IsRead]
+           ,[Description]
+           ,[CreateTime]
+           ,[CreateUser])
+     VALUES
+           (newid()
+           ,'{psychologyInfoId}'
+           ,'4'
+           ,'{item.EmpNo}'
+           ,1
+           ,0
+           ,'教师'
+           ,GETDATE()
+           ,'{userInfo.account}')");
+                            }
+
+                        }
+                        if (psychologyInfo.State >= 6)
+                        {
+                            //心理总站负责人（徐启东老师）
+                            var empInfo = db.FindList<EmpInfoEntity>($@"select a.* from {basedbname}.dbo.LR_Base_UserRelation t
+join {basedbname}.dbo.lr_base_user u on t.f_userid=u.f_userid
+join empinfo a on u.f_account=a.empno
+ where t.f_objectId='e443f997-dc6c-4bb0-998a-534163c852f6' ");
+
+                            foreach (var item in empInfo)
+                            {
+                                db.ExecuteBySql($@"INSERT INTO [dbo].[PsychologyReadInfo]
+           ([Id]
+           ,[PsychologyInfoId]
+           ,[State]
+           ,[Account]
+           ,[IsReply]
+           ,[IsRead]
+           ,[Description]
+           ,[CreateTime]
+           ,[CreateUser])
+     VALUES
+           (newid()
+           ,'{psychologyInfoId}'
+           ,'5'
+           ,'{item.EmpNo}'
+           ,1
+           ,0
+           ,'教师'
+           ,GETDATE()
+           ,'{userInfo.account}')");
+                            }
+
+                        }
+                        #endregion
+
+                        #endregion
+
                     }
                     db.Update(entity);
                 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/SalaryInfo/SalaryInfoEntity.cs

@@ -179,6 +179,12 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         /// </summary>
         [Column("YILIAO")]
         public decimal? YiLiao { get; set; }
+        /// <summary>
+        /// 病事假扣款
+        /// </summary>
+        [Column("BingShiJiaKK")]
+        public decimal? BingShiJiaKK { get; set; }
+        
         /// <summary>
         /// 扣发工资
         /// </summary>