合并

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

@@ -126,7 +126,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult SubmitForm(string keyValue)
         {
             psychologyInfoIBLL.SubmitEntity(keyValue);
-            return Success("删除成功！");
+            return Success("提交成功！");
         }
         #endregion
 

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

@@ -111,7 +111,7 @@ var bootstrap = function ($, learun) {
                     }
                     learun.layerConfirm('是否确认提交该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/PsychologyInfo/SubmitForm', { keyValue: keyValue }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/PsychologyInfo/SubmitForm', { keyValue: keyValue }, function () {
                                 refreshGirdData();
                             });
                         }

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

@@ -47,7 +47,7 @@ var bootstrap = function ($, learun) {
 
 
             $('#Url').lrUploader();
-            $('#StuUrl').lrUploader();
+            $('#StuUrl').lrUploader({ isUpload: false });
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -47,8 +47,8 @@ var bootstrap = function ($, learun) {
             });
 
 
-            $('#Url').lrUploader();
-            $('#StuUrl').lrUploader();
+            $('#Url').lrUploader({ isUpload: false });
+            $('#StuUrl').lrUploader({ isUpload: false });
         },
         initData: function () {
             if (!!PsychologyInfoId) {

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

@@ -68,9 +68,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
                 var db = this.BaseRepository().getDbConnection().Database;
                 var strSql = new StringBuilder();
-                strSql.Append(" SELECT t.*,l.F_RealName,p.ReplyContent,p.Url as Urls,p.ReplyUser,p.ReplyTime,s.StuName,s.deptNo,s.majorno,s.classno,s.GenderNo,s.IdentityCardNo,s.IsSingle FROM PsychologyInfo t ");
+                strSql.Append(" SELECT t.*,p.ReplyContent,p.Url as Urls,p.ReplyUser,p.ReplyTime,l.F_RealName FROM PsychologyInfo t ");
                 strSql.Append(" left join PsychologyReplyInfo p on p.PsychologyInfoid = t.id  AND p.State = t.State ");
-                strSql.Append(" left join StuInfoBasic s on s.StuNo = t.StuNo ");
                 strSql.Append($" left join {db}.dbo.LR_Base_User l on l.F_account =p.ReplyUser ");
                 strSql.Append(" where 1=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -80,49 +79,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
                     strSql.Append(" AND t.StuNo = @StuNo ");
                 }
-                if (!queryParam["StuName"].IsEmpty())
-                {
-                    dp.Add("StuName", queryParam["StuName"].ToString(), DbType.String);
-                    strSql.Append(" AND s.StuName = @StuName ");
-                }
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
-                    strSql.Append(" AND s.DeptNo = @DeptNo ");
-                }
-                if (!queryParam["MajorNo"].IsEmpty())
-                {
-                    dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String);
-                    strSql.Append(" AND s.MajorNo = @MajorNo ");
-                }
-                if (!queryParam["ClassNo"].IsEmpty())
-                {
-                    dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
-                    strSql.Append(" AND s.ClassNo = @ClassNo ");
-                }
-                if (!queryParam["IdentityCardNo"].IsEmpty())
-                {
-                    dp.Add("IdentityCardNo", "%" + queryParam["IdentityCardNo"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND t.IdentityCardNo like @IdentityCardNo ");
-                }
-                if (!queryParam["ReplyContent"].IsEmpty())
-                {
-                    dp.Add("ReplyContent", "%" + queryParam["ReplyContent"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND t.ReplyContent like @ReplyContent ");
-                }
-                if (!queryParam["RealName"].IsEmpty())
-                {
-                    dp.Add("RealName", "%" + queryParam["RealName"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND l.F_RealName like @RealName ");
-                }
                 if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
                 {
                     dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
                     dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
                     strSql.Append(" AND ( t.CreateTime >= @startTime AND t.CreateTime <= @endTime ) ");
                 }
-
-
                 return this.BaseRepository("CollegeMIS").FindList<PsychologyInfoEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)