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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js

@@ -146,6 +146,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.AbmormityMoveMark = 1;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/Transceiver.js

@@ -106,7 +106,7 @@ var bootstrap = function ($, learun) {
                 ],
                 mainId: 'LC_ID',
                 isPage: true,
-                sidx: 'F_CreateDate DESC',
+                sidx: 'LC_accept DESC',
                 dblclick: function () {
                     page.eye();
                 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs

@@ -88,6 +88,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("Remark", "%" + queryParam["Remark"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Remark Like @Remark ");
                 }
+                if (!queryParam["AbmormityMoveMark"].IsEmpty())
+                {
+                    strSql.Append(" AND t.stuno not in(select stuno from StuInfoBasicChange where StuChangeType in('04','05','06') and checkstatus=1) ");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<StuInfoBasicEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
@@ -181,7 +185,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 {
                     return data.Photo;
                 }
-                
+
                 return "";
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs

@@ -299,7 +299,7 @@ namespace Learun.Application.WorkFlow
                 var dbMISName = this.BaseRepository("CollegeMIS").getDbConnection().Database;
                 var dp = new DynamicParameters(new { });
                 var strSql = new StringBuilder();
-                strSql.Append(" select zb.*,lnp.* from " + dbMISName + ".[dbo].LC_docx2 zb ");
+                strSql.Append(" select LC_ID,  LC_party, LC_accept, LC_amount, LC_num, LC_numdoc, LC_name, LC_important, LC_secret, LC_docx, LC_other, LC_docx2, LC_docx3, LC_docx4, LC_docx5,lnp.* from " + dbMISName + ".[dbo].LC_docx2 zb ");
                 strSql.Append(" left join  " + dbName + ".[dbo].LR_NWF_PROCESS lnp on zb.LC_ID =lnp.F_id ");
                 strSql.Append(" where 1=1 and lnp.F_SchemeCode = 'LC_docx' ");
                 strSql.Append(" and lnp.F_EnabledMark != '3' and lnp.F_EnabledMark != '2' and lnp.F_IsChild='0' ");
@@ -325,7 +325,7 @@ namespace Learun.Application.WorkFlow
                     DateTime endTime = queryParam["EndTime"].ToDate();
                     strSql.Append(" and CONVERT(varchar, zb.lc_accept) >= CONVERT(varchar, '" + startTime + "') and CONVERT(varchar, zb.LC_accept) <= CONVERT(varchar, '" + endTime + "')");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<LC_docx2Entity>(strSql.ToString(), dp);
+                return this.BaseRepository("CollegeMIS").FindList<LC_docx2Entity>(strSql.ToString(), dp,pagination);
 
             }
             catch (Exception ex)