Merge branch '西昌分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 西昌分支

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html

@@ -17,11 +17,13 @@
                 <div><span>专业</span><strong></strong></div>
                 <div><span>班级</span><strong></strong></div>
                 <div><span>教室</span><strong></strong></div>
+				<div><span>学号</span><strong></strong></div>
+				<div><span>寝室号</span><strong></strong></div>
             </div>
-			<div class="sQrText">
+			<!-- <div class="sQrText">
 				<div>班主任姓名 <span></span></div>
 				<div>班主任电话 <span></span></div>
-			</div>
+			</div> -->
 			<div class="sQrText">
 				<div>辅导员姓名 <span></span></div>
 				<div>辅导员电话 <span></span></div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js

@@ -12,6 +12,10 @@
             learun.layer.loading(true, '获取数据中');
             learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => {
                 if (data) {
+					//辅导员
+                    $('.sQrText span').eq(0).html(data.StuInfoFreshEntity.ClassTutorName != null ? data.StuInfoFreshEntity.ClassTutorName.slice(0, 1) + "老师" : "");
+                    $('.sQrText span').eq(1).html(data.StuInfoFreshEntity.ClassTutorMobile);
+					
                     //判断是否显示报到二维码：未确认报到，且已完善信息，且缴费三有一；
                     var entity = data["StuInfoFreshEntity"];
                     if (entity.RegisterStatus == "1") {
@@ -29,11 +33,14 @@
                         return false;
                     }
                     if (entity.PayFeeStatus != "1" && entity.StudentLoanStatus != "1" && entity.OnsitePayFeeStatus != "1") {
-                        learun.layer.loading(false);
-                        learun.layer.confirm('新生未缴费，无法报到！', function (_index) {
-                            learun.nav.closeCurrent();
-                        }, '智慧校园提示', ['确定']);
-                        return false;
+						if(!entity.StudentLoanBLStatus)
+						{
+							learun.layer.loading(false);
+							learun.layer.confirm('新生未缴费且未设置贷款状态，无法报到！', function (_index) {
+							    learun.nav.closeCurrent();
+							}, '智慧校园提示', ['确定']);
+							return false;
+						}
                     }
 
                     //学生
@@ -42,12 +49,12 @@
                     $('.sQrList strong').eq(2).html(data.StuInfoFreshEntity.MajorNo);
                     $('.sQrList strong').eq(3).html(data.StuInfoFreshEntity.ClassNo);
                     $('.sQrList strong').eq(4).html(data.StuInfoFreshEntity.DefaultClassRoomName);
+					$('.sQrList strong').eq(5).html(data.StuInfoFreshEntity.StuNo);
+					$('.sQrList strong').eq(6).html(data.StuInfoFreshEntity.DormitoryName);
                     //班主任
-                    $('.sQrText span').eq(0).html(data.StuInfoFreshEntity.ClassDiredctorName != null ? data.StuInfoFreshEntity.ClassDiredctorName.slice(0, 1) + "老师" : "");
-                    $('.sQrText span').eq(1).html(data.StuInfoFreshEntity.ClassDiredctorMobile);
-                    //辅导员
-                    $('.sQrText span').eq(2).html(data.StuInfoFreshEntity.ClassTutorName != null ? data.StuInfoFreshEntity.ClassTutorName.slice(0, 1) + "老师" : "");
-                    $('.sQrText span').eq(3).html(data.StuInfoFreshEntity.ClassTutorMobile);
+                    // $('.sQrText span').eq(0).html(data.StuInfoFreshEntity.ClassDiredctorName != null ? data.StuInfoFreshEntity.ClassDiredctorName.slice(0, 1) + "老师" : "");
+                    // $('.sQrText span').eq(1).html(data.StuInfoFreshEntity.ClassDiredctorMobile);
+
                     //二维码
                     learun.code.encode({ id: 'lr_mycode_qrcode', text: data.StuInfoFreshEntity.StuNo });
 

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.html

@@ -1,11 +1,16 @@
-<div class="welcome">
+<div class="welcome">
     
-    <div class="welBox">
-        <div class="welInput">
+    <div class="welBox2">
+        <!-- <div class="welInput">
             <span>贷款回执码</span>
             <input id="ID" type="hidden"/>
             <input id="StudentLoan" type="text" placeholder="请填写贷款回执码" value=""/>
-        </div>
+        </div> -->
+		<div class="welInput">
+			<span>办理贷款状态</span>
+			<input id="ID" type="hidden"/>
+			<div id="StudentLoanBLStatus"></div>
+		</div>
     </div>
     <div class="welLine"></div>
     

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js

@@ -1,4 +1,4 @@
-(function () {
+(function () {
     var page = {
         isScroll: false,
         init: function ($page) {
@@ -9,7 +9,8 @@
                     for (var id in data) {
                         if (id == "StuInfoFreshEntity") {
                             $page.find("#ID").val(data[id].ID);
-                            $page.find("#StudentLoan").val(data[id].StudentLoan);
+							$page.find("#StudentLoanBLStatus").lrpickerSet(data[id].StudentLoanBLStatus);
+                            //$page.find("#StudentLoan").val(data[id].StudentLoan);
                             if (data[id].StudentLoanStatus == "1") {
                                 learun.layer.loading(false);
                                 learun.layer.confirm('新生助学贷款已审核！', function (_index) {
@@ -28,17 +29,23 @@
             $page.find('#saveBtn').on('tap', function () {
                 var postdata = {
                     ID: $('#ID').val(),
-                    StudentLoan: $('#StudentLoan').val(),
-                    StudentLoanStatus: "0"
+                    // StudentLoan: $('#StudentLoan').val(),
+					StudentLoan: '',
+                    StudentLoanStatus: "0",
+					StudentLoanBLStatus:$("#StudentLoanBLStatus").lrpickerGet()
                 };
-                if ($('#StudentLoan').val().trim() != null && $('#StudentLoan').val().trim() != "" && $('#StudentLoan').val().trim() != undefined) {
-                    postdata.StudentLoanStatus = "1";
-                }
+                // if ($('#StudentLoan').val().trim() != null && $('#StudentLoan').val().trim() != "" && $('#StudentLoan').val().trim() != undefined) {
+                //     postdata.StudentLoanStatus = "1";
+                // }
+				if ($('#StudentLoanBLStatus').lrpickerGet().trim() != null && $('#StudentLoanBLStatus').lrpickerGet().trim() != "" && $('#StudentLoanBLStatus').lrpickerGet().trim() != undefined) {
+				    postdata.StudentLoanBLStatus = "2";
+				}
                 learun.httpget(config.webapi + "StuInfoFresh/saveLoan", postdata, (data) => {
                     if (data) {
                         learun.layer.toast('保存成功');
                         setTimeout(function () {
                             learun.nav.closeCurrent();
+							learun.nav.go({ path: '/EducationalAdministration/StuInfoFresh/RegisterQRCode', title: '生成报到二维码', isBack: true, isHead: true, param: {}, type: 'right' });
                         }, 2000);
                     }
                 });
@@ -47,7 +54,11 @@
 
         },
         bind: function ($page) {
-
+			$page.find('#StudentLoanBLStatus').lrpickerex({
+			    code: 'StudentLoanBLStatus', 
+			    type:'dataItem'
+			}); 
+			
         }
     };
 

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/IdCardLogin/IdCardLogin.js

@@ -41,7 +41,7 @@
                 var up = false;
                 if (account === "") {
                     learun.layer.warning('身份证号不能为空！', function () { }, '提示', '关闭');
-                }else if(account.length<=6){
+                }else if(account.length<=8){
                     learun.layer.warning('身份证号输入有误！', function () { }, '提示', '关闭');
 				} else if (password === "") {
                     learun.layer.warning('密码不能为空！', function () { }, '提示', '关闭');

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypassword/modifypassword.html

@@ -1,4 +1,4 @@
-<<div style="margin-top:10px;" class="lr-form-container" id="modifypasswordform">
+<div style="margin-top:10px;" class="lr-form-container" id="modifypasswordform">
     <div class="lr-form-row">
         <label>原密码</label>
         <input id="oldpassword" type="password" isvalid="yes" checkexpession="NotNull" errormsg="原密码">

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypasswordandnotice/modifypasswordandnotice.html

@@ -1,4 +1,4 @@
-<<div style="margin-top:10px;" class="lr-form-container" id="modifypasswordform">
+<div style="margin-top:10px;" class="lr-form-container" id="modifypasswordform">
     <div class="lr-form-row">
         <label>原密码</label>
         <input id="oldpassword" type="password" isvalid="yes" checkexpession="NotNull" errormsg="原密码">

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.html

@@ -21,10 +21,10 @@
 			<span>班级：</span><span id="ClassNo"></span>
 		</div>
 		<div class="noticeTxt">
-			<span>辅导员：</span><span id="ClassTutorName"></span>
+			<span>辅导员：</span><span id="ClassDiredctorName"></span>
 		</div>
 		<div class="noticeTxt">
-			<span>电话：</span><span id="ClassTutorMobile"></span>
+			<span>电话：</span><span id="ClassDiredctorMobile"></span>
 		</div>
 		<div class="noticeTxt">
 			<span>宿舍：</span><span id="Dormitory"></span>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js

@@ -16,8 +16,8 @@
                         $('#DeptNo').html(entity.DeptNo);
                         $('#MajorNo').html(entity.MajorNo);
                         $('#ClassNo').html(entity.ClassNo);
-                        $('#ClassTutorName').html(entity.ClassTutorName);
-                        $('#ClassTutorMobile').html(entity.ClassTutorMobile);
+                        $('#ClassDiredctorName').html(entity.ClassDiredctorName);
+                        $('#ClassDiredctorMobile').html(entity.ClassDiredctorMobile);
                         $('#PayFeeStatus').html(entity.PayFeeStatus == "1" ? "已缴费" : "未缴费");
                         $('#CollectFileStatus').html(entity.CollectFileStatus == "1" ? "已提交" : "未提交");
                         $('#GetKeyStatus').html(entity.GetKeyStatus == "1" ? "已领取" : "未领取");

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html

@@ -3,7 +3,7 @@
     <!-- 未完成 类名 sSec1Type2 图片   enter2-1 enter2-2 enter2-3 enter2-4 enter2-5-->
     <!-- 可以点击类名  sSec1Tap -->
     <div class="ensHeader">
-        <div class="ensTime">2020</div>
+        <div class="ensTime">2021</div>
         <div class="ensHeadT">新生入校流程</div>
     </div>
     <div class="ensSec1">
@@ -24,7 +24,7 @@
                 <img src="images/enter2-2.png" alt="">
                 <div class="sSec1Txt">
                     线上缴费
-                    <span>( 已缴费、未缴费 )</span>
+                    <span>(地址：http://onlinepay.xcmzyz.com/)</span>
                 </div>
                 <div class="sSec1State">未完成</div>
             </div>
@@ -32,18 +32,18 @@
                 <img src="images/enter2-3.png" alt="">
                 <div class="sSec1Txt">
                     助学贷款
-                    <span>( 填写贷款回执码 )</span>
+                    <span>( 选择办理贷款状态 )</span>
                 </div>
                 <div class="sSec1State">未完成</div>
             </div>
-            <div class="sSec1Con sSec1Type2" id="OnsitePayFeeStatus">
+            <!-- <div class="sSec1Con sSec1Type2" id="OnsitePayFeeStatus">
                 <img src="images/enter2-4.png" alt="">
                 <div class="sSec1Txt">
                     现场缴费
                     <span>( 已缴费、缓交、部分缴费、未缴费 )</span>
                 </div>
                 <div class="sSec1State">未完成</div>
-            </div>
+            </div> -->
         </div>
         <div class="eSec1Box">
             <img src="images/enter1-6.png" alt="" class="sSecDown">

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js

@@ -24,16 +24,16 @@
                     } else {
                         notCompleteStyle("#PayFeeStatus", "images/enter2-2.png");
                     }
-                    if (data["StuInfoFreshEntity"].StudentLoanStatus == "1") {
+                    if (data["StuInfoFreshEntity"].StudentLoanBLStatus) {
                         completeStyle("#StudentLoan", "images/enter1-3.png");
                     } else {
                         notCompleteStyle("#StudentLoan", "images/enter2-3.png");
                     }
-                    if (data["StuInfoFreshEntity"].OnsitePayFeeStatus == "1") {
-                        completeStyle("#OnsitePayFeeStatus", "images/enter1-4.png");
-                    } else {
-                        notCompleteStyle("#OnsitePayFeeStatus", "images/enter2-4.png");
-                    }
+                    // if (data["StuInfoFreshEntity"].OnsitePayFeeStatus == "1") {
+                    //     completeStyle("#OnsitePayFeeStatus", "images/enter1-4.png");
+                    // } else {
+                    //     notCompleteStyle("#OnsitePayFeeStatus", "images/enter2-4.png");
+                    // }
                     if (data["StuInfoFreshEntity"].RegisterStatus == "1") {
                         completeStyle("#RegisterStatus", "images/enter1-5.png");
                     } else {

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.css

@@ -1,3 +1,9 @@
+
+
+ .red{
+            color: red;
+        }
+
 .welcome {
 	height: 100%;
 	overflow: auto;
@@ -47,8 +53,10 @@
 	/* padding: 0px 12px 20px; */
 }
 .welbox2{
-	padding: 0px 12px 0px;
+	padding: 0px 20px 0px;
 	background-color: #fff;
+        position: relative;
+
 }
 .welBox.active {
 	display: block;
@@ -60,14 +68,19 @@
 	font-size: 16px;
 	line-height: 26px;
 }
-
+.welT span{
+    font-weight: 400;
+    font-size: 12px;
+    line-height: 26px;
+}
 .welT2 {
 	height: 46px;
 	line-height: 46px;
 	font-size: 16px;
 	margin: 0 -12px;
 	padding: 0 12px;
-	background-color: #EFF2F3;
+        font-weight: 800;
+	
 }
 
 .welT i {
@@ -92,6 +105,8 @@
 	font-size: 14px;
 	margin-top: 8px;
 	line-height: 0;
+        border-bottom: 1px solid #EFF2F3;
+        padding-bottom: 5px;
 }
 
 .welText div {
@@ -162,18 +177,22 @@
 .welInput .lr-picker {
     line-height: 30px;
 }
+.welUrgent{
+   position: relative;
+}
 .welCon {
 	margin-top: 18px;
-	position: relative;
+	 
 	margin: 0 -12px;
 }
 
 .welDel {
-	background: #EFF2F3;
+        text-align: right;
 	padding: 5px 12px 10px;
-	text-align: right;
+	
 }
 
+
 .welDel i,.welAdd i {
 	text-align: center;
 	width: 26px;
@@ -183,12 +202,13 @@
 	border-radius: 3px;
 	background: #ffff;
 	color: #0C86D8;
+        margin-right:10px;
 }
 
 .welAdd{
-	background: #EFF2F3;
-	margin: 0 -12px;
-	padding: 5px 12px;
+	
+	 position: absolute;
+         bottom: 12px;
 	font-size: 14px;
 	color: #0C86D8;
 }
@@ -215,7 +235,8 @@
 }
 
 .welImgAdd {
-	width: 225px;
+	
+        height:300px;
 	margin: 60px auto;
 	border: 1px solid #0C86D8;
 	border-radius: 6px;
@@ -225,6 +246,7 @@
 
 .welImgAdd img {
 	width: 100%;
+        height: 100%;
 }
 
 /* #PhotoImg {

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html

@@ -10,8 +10,8 @@
 	<div class="welCard">
 		<div class="welBox active">
 			<div class="welbox2" style="padding-bottom: 20px;">
-				<div class="welT">基本信息</div>
-				<div style="color: red;">下次请使用学号和密码登录</div>
+				<div class="welT">基本信息<span style="color: red;">（下次请使用学号和密码登录）</span></div>
+
 				<input type="hidden" name="ID" value="" id="ID" />
 				<div class="welText">
 					<div>学号</div>
@@ -80,9 +80,9 @@
 					<div class="welImgInfoTxt">3 . 文件大小165320KB以下</div>
 				</div>
 			</div>
-			<div class="btnBox">
+			<!-- <div class="btnBox">
 				<button id="saveBtn" type="button" class="lr-btn-primary lr-btn-block saveBtn">保存</button>
-			</div>
+			</div> -->
 		</div>
 
 		<div class="welBox ">
@@ -102,7 +102,8 @@
 					</div>
 					<div class="welInput">
 						<span>联系电话</span>
-						<input class="welInputs" id="telephone" type="text" placeholder="请填写联系电话(重要)" />
+						<input class="welInputs" id="telephone" type="text" onkeyup="value=value.replace(/[^\d\.]/g,'')"
+							onblur="value=value.replace(/[^\d\.]/g,'')" placeholder="请填写联系电话(重要)" />
 					</div>
 				</div>
 				<div class="welT2">紧急联系人</div>
@@ -118,7 +119,9 @@
 						</div>
 						<div class="welInput">
 							<span>手机号码</span>
-							<input class="welInputs" type="text" name="Telephone" placeholder="请填写手机号码" />
+							<input class="welInputs" type="text" name="Telephone"
+								onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')"
+								placeholder="请填写手机号码" />
 						</div>
 						<div class="welInput">
 							<span>座机号码</span>
@@ -128,14 +131,24 @@
 							<span>联系地址</span>
 							<input class="welInputs" type="text" name="Address" placeholder="请填写联系地址" />
 						</div>
-						<div class="welDel"> <i class="iconfont icon-move"></i> </div>
+						<div class="welInput">
+							<span>联系地址</span>
+							<!-- <i class="iconfont icon-move"></i> -->
+						</div>
+						<!-- <div class="welDel">
+
+							<i class="iconfont icon-move"></i>
+						</div> -->
+
+						<!-- <div class="welAdd"><i title="紧急联系人" class="iconfont icon-add"></i> 添加紧急联系人</div> -->
 					</div>
+
 				</div>
-				<div class="welAdd"><i title="紧急联系人" class="iconfont icon-add"></i> 添加紧急联系人</div>
+				<!-- <div class="welAdd"><i title="紧急联系人" class="iconfont icon-add"></i>添加紧急联系人</div> -->
 			</div>
-			<div class="btnBox">
+			<!-- <div class="btnBox">
 				<button id="saveBtn" type="button" class="lr-btn-primary lr-btn-block saveBtn">保存</button>
-			</div>
+			</div> -->
 		</div>
 
 		<div class="welBox ">
@@ -143,21 +156,21 @@
 				<div class="welInputBox">
 					<div class="welInput">
 						<span>开户银行</span>
-						<div name="DepositBank" id="DepositBank"  placeholder="请选择开户银行" value=""></div>
+						<div name="DepositBank" id="DepositBank" placeholder="请选择开户银行" value=""></div>
 					</div>
 					<div class="welInput">
 						<span>银行卡号</span>
 						<input class="welInputs" id="BankCard" type="text" placeholder="银行卡号" />
 					</div>
 					<div class="welInput">
-						<span>开  户  行</span>
+						<span>开 户 行</span>
 						<input class="welInputs" id="BankLocation" type="text" placeholder="开户行" />
 					</div>
 				</div>
 			</div>
-			<div class="btnBox">
+			<!-- <div class="btnBox">
 				<button id="saveBtn1" type="button" class="lr-btn-primary lr-btn-block saveBtn">保存</button>
-			</div>
+			</div> -->
 		</div>
 
 		<div class="welBox">

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js

@@ -14,7 +14,7 @@
 				$('.welBox').css('display', 'none').eq(ind).fadeIn()
 			})
             //增加联系人
-            $page.find('.welAdd i').on('tap', function () {
+            $page.find('.welAdd').on('tap', function () {
                 var FamilyHtml = '<div class="welCon"><form class="welConForm">' +
                     '<div class="welInput">' +
                     '<span>姓名</span>' +
@@ -118,6 +118,12 @@
 				data) => {
 					//console.log('datadata',data);
 				if (data) {
+					if(!data['StuInfoFreshEntity'])
+					{
+						learun.layer.loading(false);
+						learun.layer.toast('未查询到新生数据，请确认是否为新生。');
+						return;
+					}
 					//基本信息
 					for (var id in data['StuInfoFreshEntity']) {
 						var dom = $('#' + id)[0];
@@ -212,24 +218,57 @@
 							'</div>' +
 							'<div class="welInput">' +
 							'<span>手机号码</span>' +
-							'<input class="welInputs" type="text" name="Telephone" placeholder="请填写手机号码" value="' +
+							'<input class="welInputs Telephone" type="text" name="Telephone"   placeholder="请填写手机号码" value="' +
 							item.Telephone + '"/>' +
 							'</div>' +
 							'<div class="welInput">' +
 							'<span>座机号码</span>' +
-							'<input class="welInputs" type="text" name="Mobile" placeholder="请填写座机号码" value="' +
+							'<input class="welInputs Telephone2" type="text" name="Mobile"   placeholder="请填写座机号码" value="' +
 							item.Mobile + '"/>' +
 							'</div>' +
 							'<div class="welInput">' +
 							'<span>联系地址</span>' +
 							'<input class="welInputs" type="text" name="Address" placeholder="请填写联系地址" value="' +item.Address + '"/>' +
 							'</div>' +
-							'<div class="welDel"> <i class="iconfont icon-move"></i> </div>' +
+							//'<div class="welDel"> <i class="iconfont icon-move"></i> </div>' +
 							'</form></div > ';
+                                                    
 						$('#StuInfoFreshEmergePeople').append(html);
 
-					});
-}
+					       });
+                                          }
+$('.Telephone').on('blur',function(item){
+var reg = new RegExp("^[0-9]*$")
+	if(!reg.test($(".Telephone").val())){
+
+           $(".Telephone").val("")
+           $('.Telephone').attr('placeholder',"手机号只能为数字");
+         learun.layer.loading(true, '手机号只能为数字');
+           setTimeout(function(){
+			           	learun.layer.loading(false);
+			},1000)
+	
+      
+		
+	}
+
+		
+})
+
+         $('.Telephone2').on('blur',function(item){
+        var reg = new RegExp(/^\d{3}-\d{7,8}|\d{4}-\d{7,8}$/)
+	if(!reg.test($(".Telephone2").val())){
+
+           $(".Telephone2").val("")
+           $('.Telephone2').attr('placeholder',"座机号只能为数字");
+           learun.layer.loading(true, '座机号只能为数字');
+           setTimeout(function(){
+		learun.layer.loading(false);
+            },1000)
+		
+	}
+		
+})
 
 					page.bind($page);
 					learun.layer.loading(false);
@@ -239,8 +278,11 @@
 			});
 
 			
+			
+	
             //保存
             $page.find('.saveBtn').on('tap', function () {
+
 				var postdata = {
 					ID: $('#ID').val(),
 					RegionNo: $('#RegionNo').val(),
@@ -260,7 +302,8 @@
                     learun.layer.loading(false);
                     if (data) {
                         learun.layer.toast('保存成功');
-                        location.reload();
+						learun.nav.closeCurrent();
+						learun.nav.go({ path: 'notice2', title: '新生入校流程', type: 'right' });
                     }
                 });
 
@@ -329,6 +372,7 @@
         var list = new Array();
         $.each($('#StuInfoFreshEmergePeople').children('.welCon'), function (i, item) {
             var o = $(item).children(".welConForm").serializeObject();
+			o.Relation = $(item).find('[name="Relation"]').lrpickerGet();
             list.push(o);
         });
         return list;

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/modulelist/modulelist.js

@@ -1,4 +1,4 @@
-(function () {
+(function () {
 
     var page = {
         isScroll: true,

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace.html

@@ -113,7 +113,7 @@
                         $desktop.append(_html);
                         chartMap[_item.F_Id] = echarts.init(document.getElementById(_item.F_Id));
 
-                        // 获取后台数据
+                        // // 获取后台数据
                         learun.httpget(config.webapi + "learun/adms/desktop/data", { type: 'chart', id: _item.F_Id }, function (data) {
                             if (data) {
                                 var type = $('#' + data.Id).attr('data-desktop');
@@ -226,7 +226,7 @@
                     }
 					if (learun.storage.get('isUpdStu') === true) {
 						learun.storage.set('isUpdStu',null);
-						learun.nav.go({ path: 'login/IdCardLogin', title: '身份证登录', type: 'right' });
+						learun.nav.go({ path: 'welcome', title: '完善信息', type: 'right' });
 					    //learun.nav.go({ path: 'my/modifypassword', isBack: false, isHead: true, title:'修改密码' });
 					}
                     var _html = '';

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace/workspace.html

@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script type="text/javascript">
     (function ($, learun) {
         learun.nav.data["workspace"].jsObj = (function () {
 
@@ -45,27 +45,27 @@
                     <div class="lr-content" data-desktop="'+ _item.F_Id + '" ></div>\
                 </div>';
                         $desktop.append(_html);
-                        learun.httpget(config.webapi + "learun/adms/desktop/data", { type: 'list', id: _item.F_Id }, function (data) {
-                            if (data) {
-                                var $list = $('[data-desktop="' + data.Id + '"]');
-                                $.each(data.value, function (_j, _jitem) {
-                                    var _itemHtml = '\
-                                <div class="lr-list-item lr-dtlist-item">\
-                                    <div class="lr-ellipsis">'+ _jitem.f_title + '</div>\
-                                    <div class="date">'+ learun.date.format(_jitem.f_time, 'yyyy-MM-dd') + '</div>\
-                                </div>';
-                                    var _$itemHtml = $(_itemHtml);
-                                    _$itemHtml[0].item = _jitem;
-                                    $list.append(_$itemHtml);
-                                });
-                                $list.find('.lr-dtlist-item').on('tap', function () {
-                                    var item = $(this)[0].item;
-                                    learun.nav.go({ path: 'workspace/listdetaile', title: '详情', param: item, type: 'right' });
-                                });
+                        // learun.httpget(config.webapi + "learun/adms/desktop/data", { type: 'list', id: _item.F_Id }, function (data) {
+                        //     if (data) {
+                        //         var $list = $('[data-desktop="' + data.Id + '"]');
+                        //         $.each(data.value, function (_j, _jitem) {
+                        //             var _itemHtml = '\
+                        //         <div class="lr-list-item lr-dtlist-item">\
+                        //             <div class="lr-ellipsis">'+ _jitem.f_title + '</div>\
+                        //             <div class="date">'+ learun.date.format(_jitem.f_time, 'yyyy-MM-dd') + '</div>\
+                        //         </div>';
+                        //             var _$itemHtml = $(_itemHtml);
+                        //             _$itemHtml[0].item = _jitem;
+                        //             $list.append(_$itemHtml);
+                        //         });
+                        //         $list.find('.lr-dtlist-item').on('tap', function () {
+                        //             var item = $(this)[0].item;
+                        //             learun.nav.go({ path: 'workspace/listdetaile', title: '详情', param: item, type: 'right' });
+                        //         });
 
-                                $list = null;
-                            }
-                        });
+                        //         $list = null;
+                        //     }
+                        // });
                     });
                 }
             }

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

@@ -522,6 +522,21 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             stuInfoBasicIBLL.SynPhoto();
             return Success("同步成功！");
         }
+
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult SyncDept()
+        {
+            stuInfoBasicIBLL.SyncDept();
+            return Success("同步成功");
+        }
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult SyncMajor()
+        {
+            stuInfoBasicIBLL.SyncMajor();
+            return Success("同步成功");
+        }
         #endregion
     }
 }

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

@@ -55,7 +55,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View("Index");
         }
-        
+
         [HttpGet]
         public ActionResult IndexDC()
         {
@@ -286,6 +286,13 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 
         #region  获取数据
 
+        [HttpPost]
+        [AjaxOnly]
+        public void SynchronousList()
+        {
+            stuInfoFreshIBLL.SynchronousList();
+        }
+
         /// <summary>
         /// 获取列表数据
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml

@@ -93,9 +93,9 @@
                         <a id="lr_editDept" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;修改部门、系部</a>
                         <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
                     </div>
-                    <div class=" btn-group btn-group-sm" learun-authorize="no">
+                    @*<div class=" btn-group btn-group-sm" learun-authorize="no">
                         <a id="lr_import" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;导入</a>
-                        </div>
+                        </div>*@
                     </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml

@@ -53,6 +53,8 @@
                         <a id="lr_searchChange" class="btn btn-default"><i class="fa fa-search"></i>&nbsp;查看异动</a>
                         <a id="lr_photo" class="btn btn-default"><i class="fa fa-search"></i>&nbsp;拍照</a>
                         <a id="lr_printInfo" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;学生简历表</a>
+                        <a id="lr_syn" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 同步系部</a>
+                        <a id="lr_synmajor" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 同步专业</a>
 
                     </div>
                 </div>

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

@@ -216,6 +216,18 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            // 同步系部
+            $('#lr_syn').on('click', function () {
+                learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/SyncDept', function () {
+                    refreshGirdData();
+                });
+            });
+            // 同步专业
+            $('#lr_synmajor').on('click', function () {
+                learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/SyncMajor', function () {
+                    refreshGirdData();
+                });
+            });
 
         },
         // 初始化列表

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml

@@ -11,6 +11,7 @@
                 <div class="lr-layout-tool-left">
                     <div class="lr-layout-tool-item">
                         <input id="txt_Keyword" type="text" class="form-control" placeholder="考生号/准考证号/姓名/身份证号" />
+                        <input id="Grade" type="text" class="form-control" placeholder="年级" />
                     </div>
                     <div class="lr-layout-tool-item">
                         <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
@@ -21,13 +22,16 @@
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_synchronous" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;同步</a>
                         <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
                         @*<a id="lr_payFee" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;缴费</a>*@
                         <a id="lr_pay" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;线上缴费</a>
                         <a id="lr_cancelPay" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;取消线上缴费</a>
-                        <a id="lr_loan" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;填写贷款回执码</a>
-                        <a id="lr_checkLoan" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核助学贷款</a>
-                        <a id="lr_uncheckLoan" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;去审核助学贷款</a>
+                        @*<a id="lr_loan" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;填写贷款回执码</a>*@
+                        @*<a id="lr_checkLoan" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核助学贷款</a>
+        <a id="lr_uncheckLoan" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;去审核助学贷款</a>*@
+                        <a id="lr_checkLoan" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;已办理贷款</a>
+                        <a id="lr_uncheckLoan" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;正在办理贷款</a>
                         <a id="lr_onsitePay" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;现场缴费</a>
                         <a id="lr_otherPay" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;其他费用缴费</a>
                         <a id="lr_cancelOtherPay" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;取消其他费用缴费</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js

@@ -17,7 +17,8 @@ var bootstrap = function ($, learun) {
             // 查询
             $('#btn_Search').on('click', function () {
                 var keyword = $('#txt_Keyword').val();
-                page.search({ keyword: keyword });
+                var Grade = $('#Grade').val();
+                page.search({ keyword: keyword, Grade: Grade });
             });
             // 刷新
             $('#lr_refresh').on('click', function () {
@@ -115,16 +116,23 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
-                    if (selectedRow.StudentLoanStatus == "1") {
-                        learun.alert.warning("当前新生助学贷款已审核！");
-                        return;
-                    }
-                    if (selectedRow.StudentLoan == null || selectedRow.StudentLoan == "" || selectedRow.StudentLoan == undefined) {
-                        learun.alert.warning("贷款回执码为空！");
-                        return;
-                    }
+                    //if (selectedRow.StudentLoanStatus == "1") {
+                    //    learun.alert.warning("当前新生助学贷款已审核！");
+                    //    return;
+                    //}
+                    //if (selectedRow.StudentLoan == null || selectedRow.StudentLoan == "" || selectedRow.StudentLoan == undefined) {
+                    //    learun.alert.warning("贷款回执码为空！");
+                    //    return;
+                    //}
 
-                    learun.layerConfirm('是否确认审核助学贷款！', function (res) {
+                    //learun.layerConfirm('是否确认审核助学贷款！', function (res) {
+                    //    if (res) {
+                    //        learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 1 }, function () {
+                    //            refreshGirdData();
+                    //        });
+                    //    }
+                    //});
+                    learun.layerConfirm('是否确认已办理贷款！', function (res) {
                         if (res) {
                             learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 1 }, function () {
                                 refreshGirdData();
@@ -138,13 +146,20 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
-                    if (selectedRow.StudentLoanStatus != "1") {
-                        learun.alert.warning("当前新生助学贷款未审核！");
-                        return;
-                    }
-                    learun.layerConfirm('是否确认去审核助学贷款！', function (res) {
+                    //if (selectedRow.StudentLoanStatus != "1") {
+                    //    learun.alert.warning("当前新生助学贷款未审核！");
+                    //    return;
+                    //}
+                    //learun.layerConfirm('是否确认去审核助学贷款！', function (res) {
+                    //    if (res) {
+                    //        learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 0 }, function () {
+                    //            refreshGirdData();
+                    //        });
+                    //    }
+                    //});
+                    learun.layerConfirm('是否确认正在办理贷款！', function (res) {
                         if (res) {
-                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 0 }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 2 }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -186,6 +201,18 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            //同步数据
+            $('#lr_synchronous').on('click',
+                function () {
+                    learun.layerConfirm('是否要同步缴费数据！',function (res) {
+                            if (res) {
+                                learun.postForm(
+                                    top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/SynchronousList', {}, function () {
+                                    refreshGirdData();
+                                 });
+                            }
+                        });
+                });
             // 取消其他费用缴费
             $('#lr_cancelOtherPay').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
@@ -220,12 +247,23 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: '线上缴费时间', name: 'PayFeeDate', width: 130, align: "left" },
-                    { label: '贷款回执码', name: 'StudentLoan', width: 130, align: "left" },
                     {
-                        label: '助学贷款状态', name: 'StudentLoanStatus', width: 100, align: "left", formatter: function (value) {
-                            return value == 1 ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-warning\">未审核</span>";
+                        label: '办理贷款状态', name: 'StudentLoanBLStatus', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StudentLoanBLStatus',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
                         }
                     },
+                    //{ label: '贷款回执码', name: 'StudentLoan', width: 130, align: "left" },
+                    //{
+                    //    label: '助学贷款状态', name: 'StudentLoanStatus', width: 100, align: "left", formatter: function (value) {
+                    //        return value == 1 ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-warning\">未审核</span>";
+                    //    }
+                    //},
                     {
                         label: '现场缴费状态', name: 'OnsitePayFeeStatus', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {

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

@@ -0,0 +1,121 @@
+using Learun.Application.TwoDevelopment.LR_Desktop;
+using Learun.Util;
+using System.Data;
+using System.Web.Mvc;
+
+namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-18 09:54
+    /// 描 述：网上办事大厅拖拽版-卡片块排序管理
+    /// </summary>
+    public class SSO_Drag_CardSortManageController : MvcControllerBase
+    {
+        private SSO_Drag_CardSortManageIBLL sSO_Drag_CardSortManageIBLL = new SSO_Drag_CardSortManageBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList( string queryJson )
+        {
+            var data = sSO_Drag_CardSortManageIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sSO_Drag_CardSortManageIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var data = sSO_Drag_CardSortManageIBLL.GetEntity(keyValue);
+            return Success(data);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sSO_Drag_CardSortManageIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue,SSO_Drag_CardSortManageEntity entity)
+        {
+            sSO_Drag_CardSortManageIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,121 @@
+using Learun.Application.TwoDevelopment.LR_Desktop;
+using Learun.Util;
+using System.Data;
+using System.Web.Mvc;
+
+namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-18 09:47
+    /// 描 述：网上办事大厅拖拽版-桌面管理
+    /// </summary>
+    public class SSO_Drag_DesktopManageController : MvcControllerBase
+    {
+        private SSO_Drag_DesktopManageIBLL sSO_Drag_DesktopManageIBLL = new SSO_Drag_DesktopManageBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList( string queryJson )
+        {
+            var data = sSO_Drag_DesktopManageIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sSO_Drag_DesktopManageIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var data = sSO_Drag_DesktopManageIBLL.GetEntity(keyValue);
+            return Success(data);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sSO_Drag_DesktopManageIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue,SSO_Drag_DesktopManageEntity entity)
+        {
+            sSO_Drag_DesktopManageIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Form.cshtml

@@ -0,0 +1,27 @@
+@{
+    ViewBag.Title = "网上办事大厅拖拽版-卡片块排序管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">主键<font face="宋体">*</font></div>
+        <input id="Id" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">用户<font face="宋体">*</font></div>
+        <input id="UserId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">模式编号：0办事大厅模式，1效率优先模式，2管理驾驶舱模式<font face="宋体">*</font></div>
+        <input id="ModelCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">桌面Id<font face="宋体">*</font></div>
+        <input id="DesktopId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">卡片块排序<font face="宋体">*</font></div>
+        <input id="CardSort" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Form.js")

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

@@ -0,0 +1,38 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-03-18 09:54
+ * 描  述：网上办事大厅拖拽版-卡片块排序管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var selectedRow = learun.frameTab.currentIframe().selectedRow;
+    var page = {
+        init: function () {
+            page.initData();
+        },
+        bind: function () {
+        },
+        initData: function () {
+            if (!!selectedRow) {
+                $('#form').lrSetFormData(selectedRow);
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('#form').lrValidform()) {
+            return false;
+        }
+        var postData = $('#form').lrGetFormData();
+        $.lrSaveForm(top.$.rootUrl + '/LR_Desktop/SSO_Drag_CardSortManage/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Index.cshtml

@@ -0,0 +1,39 @@
+@{
+    ViewBag.Title = "网上办事大厅拖拽版-卡片块排序管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout lr-layout-left-center" id="lr_layout">
+    <div class="lr-layout-left">
+        <div class="lr-layout-wrap">
+            <div class="lr-layout-title">树形目录</div>
+            <div id="tree" class="lr-layout-body"></div>
+        </div>
+    </div>
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap">
+            <div class="lr-layout-title">标题</div>
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Index.js")

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

@@ -0,0 +1,94 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-03-18 09:54
+ * 描  述：网上办事大厅拖拽版-卡片块排序管理
+ */
+var selectedRow;
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var keyword = $('#txt_Keyword').val();
+                page.search({ keyword: keyword });
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                selectedRow = null;
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_CardSortManage/Form',
+                    width: 700,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_CardSortManage/Form?keyValue=' + keyValue,
+                        width: 700,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/LR_Desktop/SSO_Drag_CardSortManage/DeleteForm', { keyValue: keyValue}, function () {
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_CardSortManage/GetPageList',
+                headData: [
+                        { label: '主键', name: 'Id', width: 200, align: "left" },
+                        { label: '用户', name: 'UserId', width: 200, align: "left" },
+                        { label: '模式编号：0办事大厅模式，1效率优先模式，2管理驾驶舱模式', name: 'ModelCode', width: 200, align: "left" },
+                        { label: '桌面Id', name: 'DesktopId', width: 200, align: "left" },
+                        { label: '卡片块排序', name: 'CardSort', width: 200, align: "left" },
+                ],
+                mainId:'Id',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Form.cshtml

@@ -0,0 +1,31 @@
+@{
+    ViewBag.Title = "网上办事大厅拖拽版-桌面管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">主键<font face="宋体">*</font></div>
+        <input id="Id" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">用户<font face="宋体">*</font></div>
+        <input id="UserId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">模式编号：0办事大厅模式，1效率优先模式，2管理驾驶舱模式<font face="宋体">*</font></div>
+        <input id="ModelCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">桌面名称<font face="宋体">*</font></div>
+        <input id="DesktopName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">桌面编号<font face="宋体">*</font></div>
+        <input id="DesktopCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">排序号<font face="宋体">*</font></div>
+        <input id="Sort" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Form.js")

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

@@ -0,0 +1,38 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-03-18 09:47
+ * 描  述：网上办事大厅拖拽版-桌面管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var selectedRow = learun.frameTab.currentIframe().selectedRow;
+    var page = {
+        init: function () {
+            page.initData();
+        },
+        bind: function () {
+        },
+        initData: function () {
+            if (!!selectedRow) {
+                $('#form').lrSetFormData(selectedRow);
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('#form').lrValidform()) {
+            return false;
+        }
+        var postData = $('#form').lrGetFormData();
+        $.lrSaveForm(top.$.rootUrl + '/LR_Desktop/SSO_Drag_DesktopManage/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Index.cshtml

@@ -0,0 +1,39 @@
+@{
+    ViewBag.Title = "网上办事大厅拖拽版-桌面管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout lr-layout-left-center" id="lr_layout">
+    <div class="lr-layout-left">
+        <div class="lr-layout-wrap">
+            <div class="lr-layout-title">树形目录</div>
+            <div id="tree" class="lr-layout-body"></div>
+        </div>
+    </div>
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap">
+            <div class="lr-layout-title">标题</div>
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Index.js")

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

@@ -0,0 +1,95 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-03-18 09:47
+ * 描  述：网上办事大厅拖拽版-桌面管理
+ */
+var selectedRow;
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var keyword = $('#txt_Keyword').val();
+                page.search({ keyword: keyword });
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                selectedRow = null;
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_DesktopManage/Form',
+                    width: 700,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_DesktopManage/Form?keyValue=' + keyValue,
+                        width: 700,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/LR_Desktop/SSO_Drag_DesktopManage/DeleteForm', { keyValue: keyValue}, function () {
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_DesktopManage/GetPageList',
+                headData: [
+                        { label: '主键', name: 'Id', width: 200, align: "left" },
+                        { label: '用户', name: 'UserId', width: 200, align: "left" },
+                        { label: '模式编号：0办事大厅模式，1效率优先模式，2管理驾驶舱模式', name: 'ModelCode', width: 200, align: "left" },
+                        { label: '桌面名称', name: 'DesktopName', width: 200, align: "left" },
+                        { label: '桌面编号', name: 'DesktopCode', width: 200, align: "left" },
+                        { label: '排序号', name: 'Sort', width: 200, align: "left" },
+                ],
+                mainId:'Id',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs

@@ -16,6 +16,8 @@ using System.Web.Mvc;
 using Learun.Cache.Base;
 using Learun.Cache.Factory;
 using Newtonsoft.Json;
+using Learun.Application.TwoDevelopment.LR_Desktop;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
 
 namespace Learun.Application.Web.Controllers
 {
@@ -37,6 +39,23 @@ namespace Learun.Application.Web.Controllers
         private Sys_ReceiveFileIBLL sys_ReceiveFileIBLL = new Sys_ReceiveFileBLL();
         private Perm_FunctionVisitIBLL functionVisitIbll = new Perm_FunctionVisitBLL();
         private ICache redisCache = CacheFactory.CaChe();
+        private SSO_Drag_DesktopManageIBLL sSO_Drag_DesktopManageIBLL = new SSO_Drag_DesktopManageBLL();
+        private SYS_SendMessageIBLL sYS_SendMessageIBLL = new SYS_SendMessageBLL();
+        private CdMajorIBLL cdMajorIBLL = new CdMajorBLL();
+        private ClassInfoIBLL classInfoIBLL = new ClassInfoBLL();
+        private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL();
+        private ClassroomInfoIBLL classroomInfoIBLL = new ClassroomInfoBLL();
+        private EmpInfoIBLL empInfoIBLL = new EmpInfoBLL();
+        private SSO_Drag_CardSortManageIBLL sSO_Drag_CardSortManageIBLL = new SSO_Drag_CardSortManageBLL();
+        private LessonInfoIBLL lessonInfoIBLL = new LessonInfoBLL();
+        private CdLessonSortIBLL cdLessonSortIBLL = new CdLessonSortBLL();
+        private CdLessonTypeIBLL cdLessonTypeIBLL = new CdLessonTypeBLL();
+        private BCdCultureDegreeIBLL bCdCultureDegreeIBLL = new BCdCultureDegreeBLL();
+        private StuScoreNotPassIBLL stuScoreNotPassIBLL = new StuScoreNotPassBLL();
+        private Sys_QRCodeInLoginIBLL sys_QRCodeInLoginIBLL = new Sys_QRCodeInLoginBLL();
+        private TeachSwitchIBLL teachSwitchIBLL = new TeachSwitchBLL();
+        private StuSaverecordIBLL stuSaverecordIBLL = new StuSaverecordBLL();
+        private StuConsumptionIBLL stuConsumptionIBLL = new StuConsumptionBLL();
 
         #region 统一身份认证2.0
         /// <summary>
@@ -840,5 +859,961 @@ namespace Learun.Application.Web.Controllers
             return ip;
         }
 
+        /// <summary>
+        /// 网上办事大厅拖拽版-未登录页面
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult DragNoLogin()
+        {
+            //获取错误次数
+            ViewBag.errornum = OperatorHelper.Instance.GetCurrentErrorNum();
+            //获取高职版跳转地址
+            ViewBag.DigitalschoolMisLoginurl = ConfigurationManager.AppSettings["DigitalschoolMisLoginurl"];
+            ViewBag.Returnurl = "http://" + Request.Url.Host + ":" + Request.Url.Port;
+            //获取登录页二维码配置信息
+            ViewBag.HasQRCode = false;
+            var qrcodelist = sys_QRCodeInLoginIBLL.GetList().ToList().Where(x => x.EnabledMark == 1).OrderByDescending(x => x.CreateTime);
+            if (qrcodelist.Any())
+            {
+                ViewBag.HasQRCode = true;
+                ViewBag.QRCodeUrl = qrcodelist.FirstOrDefault().QRCodeUrl;
+                ViewBag.QRCodeText = qrcodelist.FirstOrDefault().Title;
+            }
+            //微信快捷登录
+            var result4 = teachSwitchIBLL.FindFirst("wxloginforpc");
+            ViewBag.WeixinLoginSwitch = result4;
+
+
+            return View();
+        }
+
+        /// <summary>
+        /// 网上办事大厅拖拽版-未登录页面-微信登录
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult DragNoWxLogin()
+        {
+            string QQOpenId = Request.QueryString["QQOpenId"];
+            string WeixinOpenId = Request.QueryString["WeixinOpenId"];
+            ViewBag.WeixinOpenId = WeixinOpenId;
+            ViewBag.QQOpenId = QQOpenId;
+
+            //获取错误次数
+            ViewBag.errornum = OperatorHelper.Instance.GetCurrentErrorNum();
+            //获取高职版跳转地址
+            ViewBag.DigitalschoolMisLoginurl = ConfigurationManager.AppSettings["DigitalschoolMisLoginurl"];
+            ViewBag.Returnurl = "http://" + Request.Url.Host + ":" + Request.Url.Port;
+            //获取登录页二维码配置信息
+            ViewBag.HasQRCode = false;
+            var qrcodelist = sys_QRCodeInLoginIBLL.GetList().ToList().Where(x => x.EnabledMark == 1).OrderByDescending(x => x.CreateTime);
+            if (qrcodelist.Any())
+            {
+                ViewBag.HasQRCode = true;
+                ViewBag.QRCodeUrl = qrcodelist.FirstOrDefault().QRCodeUrl;
+                ViewBag.QRCodeText = qrcodelist.FirstOrDefault().Title;
+            }
+
+
+            return View();
+        }
+        /// <summary>
+        /// 网上办事大厅拖拽版-办事大厅模式
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult DragModelOne()
+        {
+            //判断登录状态码
+            string account = "";
+            if (!Request.Headers["account"].IsEmpty())
+            {
+                account = Request.Headers["account"].ToString();
+            }
+            OperatorHelper helper = new OperatorHelper();
+            var result = helper.IsOnLine(account);
+            if (result.stateCode != 1)
+            {
+                return Redirect("DragNoLogin");
+            }
+            //登录用户
+            var userInfo = LoginUserInfo.Get();
+            ViewBag.UserId = userInfo.userId;
+            //桌面管理表、卡片块排序管理表增加默认数据
+            sSO_Drag_DesktopManageIBLL.AddDefaultData(userInfo.userId, "one");
+            //获取桌面、卡片块排序列表
+            ViewBag.DesktopList = sSO_Drag_DesktopManageIBLL.GetListByModelCode(userInfo.userId, "one").OrderByDescending(x => x.DefaultFlag).ThenBy(x => x.Sort).ThenBy(x => x.CreateDate);
+            ViewBag.DesktopListStr = JsonConvert.SerializeObject(ViewBag.DesktopList);
+            //分页查询条件设置
+            Pagination paginationobj = new Pagination() { rows = 5, page = 1, sidx = "readflag asc,SENDTIME desc ", sord = "desc" };
+            //邮件-收件箱
+            var maildata = sYS_ReceiveMessageIBLL.GetPageList(paginationobj, "{\"userId\":\"" + userInfo.userId + "\"}");
+            var maildataAll = sYS_ReceiveMessageIBLL.GetList("{\"userId\":\"" + userInfo.userId + "\"}");
+            ViewBag.LanMail = maildata;
+            ViewBag.LanMailStr = JsonConvert.SerializeObject(ViewBag.LanMail);
+            ViewBag.LanMailUnReadCount = maildataAll.Count(m => m.READFLAG == 0);
+            //邮件-已发送
+            paginationobj.sidx = "SENDTIME desc";
+            var mailsenddata = sYS_SendMessageIBLL.GetPageList(paginationobj, "{\"userId\":\"" + userInfo.userId + "\"}");
+            var mailsenddataAll = sYS_SendMessageIBLL.GetList2("{\"userId\":\"" + userInfo.userId + "\"}");
+            ViewBag.LanMailSend = mailsenddata;
+            ViewBag.LanMailSendStr = JsonConvert.SerializeObject(ViewBag.LanMailSend);
+            //来往邮件数量
+            ViewBag.LanMailTotalNum = maildataAll.Count() + mailsenddataAll.Count();
+            //公文
+            paginationobj.sidx = "SendTime";
+            ViewBag.ReceiveFileList = sys_ReceiveFileIBLL.GetPageList(paginationobj, "{\"ReceiverId\":\"" + userInfo.userId + "\"}");
+            ViewBag.ReceiveFileListStr = JsonConvert.SerializeObject(ViewBag.ReceiveFileList);
+            //公告
+            List<NewsEntity> outnewslist = new List<NewsEntity>();
+            var newsList = newsIBLL.GetList("", userInfo.userId);
+            foreach (var newsitemEntity in newsList)
+            {
+                if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId))
+                {
+                    if (!string.IsNullOrEmpty(userInfo.postIds))
+                    {
+                        if (userInfo.postIds.Contains(","))
+                        {
+                            foreach (var postid in userInfo.postIds.Split(','))
+                            {
+                                if (newsitemEntity.F_SendPostId.Contains(postid))
+                                {
+                                    outnewslist.Add(newsitemEntity);
+                                    break;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            if (newsitemEntity.F_SendPostId.Contains(userInfo.postIds))
+                            {
+                                outnewslist.Add(newsitemEntity);
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId))
+                    {
+                        if (newsitemEntity.F_SendDeptId.Contains(userInfo.departmentId))
+                        {
+                            outnewslist.Add(newsitemEntity);
+                        }
+                    }
+                    else
+                    {
+                        outnewslist.Add(newsitemEntity);
+                    }
+                }
+            }
+            ViewBag.NewsList = outnewslist.Take(5);
+            ViewBag.NewsListStr = JsonConvert.SerializeObject(ViewBag.NewsList);
+            //宣传报道
+            var newsListOfxuanchuan = outnewslist.Where(x => x.F_CategoryId == "15").Take(4);
+            foreach (var item in newsListOfxuanchuan)
+            {
+                if (!string.IsNullOrEmpty(item.F_NewsImage))
+                {
+                    var imagePath = annexesFileIBLL.GetEntityByFolderId(item.F_NewsImage)?.F_FilePath;
+                    if (!string.IsNullOrEmpty(imagePath))
+                    {
+                        item.F_NewsImage = imagePath.Substring(imagePath.IndexOf("Resource"));
+                    }
+                    else
+                    {
+                        item.F_NewsImage = "/Content/images/DragSSO/noLogin.png";
+                    }
+                }
+            }
+            ViewBag.NewsListOfxuanchuan = newsListOfxuanchuan;
+            ViewBag.NewsListOfxuanchuanStr = JsonConvert.SerializeObject(ViewBag.NewsListOfxuanchuan);
+            //智慧教育
+            ViewBag.NewsListOfzhihui = outnewslist.Where(x => x.F_CategoryId == "16").Take(6);
+            ViewBag.NewsListOfzhihuiStr = JsonConvert.SerializeObject(ViewBag.NewsListOfzhihui);
+            //专题推荐
+            var newsListOfzhuanti = outnewslist.Where(x => x.F_CategoryId == "17").Take(7);
+            foreach (var item in newsListOfzhuanti)
+            {
+                if (!string.IsNullOrEmpty(item.F_NewsImage))
+                {
+                    var imagePath = annexesFileIBLL.GetEntityByFolderId(item.F_NewsImage)?.F_FilePath;
+                    if (!string.IsNullOrEmpty(imagePath))
+                    {
+                        item.F_NewsImage = imagePath.Substring(imagePath.IndexOf("Resource"));
+                    }
+                    else
+                    {
+                        item.F_NewsImage = "/Content/images/DragSSO/noLogin.png";
+                    }
+                }
+            }
+            ViewBag.NewsListOfzhuanti = newsListOfzhuanti;
+            ViewBag.NewsListOfzhuantiStr = JsonConvert.SerializeObject(ViewBag.NewsListOfzhuanti);
+            //办公事项-待办任务
+            paginationobj.sidx = "F_CreateDate";
+            paginationobj.rows = 4;
+            var taskListAll = nWFProcessIBLL.GetMyTaskPageList(userInfo, "{}");
+            ViewBag.TaskList = nWFProcessIBLL.GetMyTaskPageList(userInfo, paginationobj, "{}");
+            ViewBag.TaskListStr = JsonConvert.SerializeObject(ViewBag.TaskList);
+            ViewBag.TaskTotalNum = taskListAll.Count();
+            //办公事项-已办任务
+            var finishTaskListAll = nWFProcessIBLL.GetMyFinishTaskPageList(userInfo, "{}");
+            ViewBag.FinishTaskList = nWFProcessIBLL.GetMyFinishTaskPageList(userInfo, paginationobj, "{}");
+            ViewBag.FinishTaskListStr = JsonConvert.SerializeObject(ViewBag.FinishTaskList);
+            ViewBag.FinishTaskTotalNum = finishTaskListAll.Count();
+            //办公事项-我发起的
+            var myListAll = nWFProcessIBLL.GetMyPageList(userInfo.userId, "{}");
+            ViewBag.MyList = nWFProcessIBLL.GetMyPageList(userInfo.userId, paginationobj, "{}");
+            ViewBag.MyListStr = JsonConvert.SerializeObject(ViewBag.MyList);
+            ViewBag.MyListTotalNum = myListAll.Count();
+            //常用服务
+            List<ModuleEntity> modulelist = new List<ModuleEntity>();
+            List<string> offenused = LogBLL.GetGroupLog(userInfo.userId).Select(m => m.F_Module).Take(20).ToList();
+            var moduledata = moduleIBLL.GetModuleList().Where(m => m.F_EnabledMark == 1 && m.F_DeleteMark == 0 && !string.IsNullOrEmpty(m.F_UrlAddress) && m.F_IsMenu == 1 && m.F_Target == "iframe" && !string.IsNullOrEmpty(m.F_ParentId));
+            foreach (var oitem in offenused)
+            {
+                ModuleEntity fod = moduledata.FirstOrDefault(m => m.F_FullName == oitem);
+                if (fod != null)
+                {
+                    //找父级
+                    if (fod.F_ParentId == "0")
+                    {
+                        fod.ParentName = fod.F_FullName;
+                        fod.F_ParentId = fod.F_ModuleId;
+                    }
+                    else
+                    {
+                        var parent1 = moduleIBLL.GetModuleEntity(fod.F_ParentId);
+                        if (parent1 != null)
+                        {
+                            if (parent1.F_ParentId == "0")
+                            {
+                                fod.ParentName = parent1.F_FullName;
+                                fod.F_ParentId = parent1.F_ModuleId;
+                            }
+                            else
+                            {
+                                //下一级
+                                var parent2 = moduleIBLL.GetModuleEntity(parent1.F_ParentId);
+                                if (parent2 != null)
+                                {
+                                    if (parent2.F_ParentId == "0")
+                                    {
+                                        fod.ParentName = parent2.F_FullName;
+                                        fod.F_ParentId = parent2.F_ModuleId;
+                                    }
+                                    else
+                                    {
+                                        //下一级
+                                        var parent3 = moduleIBLL.GetModuleEntity(parent2.F_ParentId);
+                                        if (parent3 != null)
+                                        {
+                                            if (parent3.F_ParentId == "0")
+                                            {
+                                                fod.ParentName = parent3.F_FullName;
+                                                fod.F_ParentId = parent3.F_ModuleId;
+                                            }
+                                            else
+                                            {
+                                                //下一级
+                                                var parent4 = moduleIBLL.GetModuleEntity(parent3.F_ParentId);
+                                                if (parent4 != null)
+                                                {
+                                                    if (parent4.F_ParentId == "0")
+                                                    {
+                                                        fod.ParentName = parent4.F_FullName;
+                                                        fod.F_ParentId = parent4.F_ModuleId;
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    modulelist.Add(fod);
+                }
+            }
+            ViewBag.OffenusedAll = modulelist;
+
+            var mm = modulelist.GroupBy(x => x.F_ParentId).Select(x => new ModuleEntity()
+            {
+                F_ParentId = x.Key,
+                ParentName = x.FirstOrDefault().ParentName,
+                ChildrenList = x.Select(y => new ModuleEntity()
+                {
+                    F_ModuleId = y.F_ModuleId,
+                    F_FullName = y.F_FullName
+                }).ToList()
+            }).ToList();
+            ViewBag.OffenusedGroup = mm;
+            ViewBag.OffenusedGroupStr = JsonConvert.SerializeObject(ViewBag.OffenusedGroup);
+            //查找服务
+            List<ModuleEntity> searchmodulelist = new List<ModuleEntity>();
+            foreach (var item in moduledata)
+            {
+                if (moduleIBLL.GetColumnList(item.F_ModuleId).Any())
+                {
+                    item.FirstLetter = Str.PinYin(item.F_FullName).Substring(0, 1);
+                    searchmodulelist.Add(item);
+                }
+            }
+            ViewBag.SearchModule = searchmodulelist;
+            //校园总览
+            //专业
+            var majorData = cdMajorIBLL.GetAllList();
+            ViewBag.MajorTotalNum = majorData.Count();
+            //班级
+            var classInfoData = classInfoIBLL.GetAllClass();
+            ViewBag.ClassInfoTotalNum = classInfoData.Count();
+            //学生
+            var stuInfoData = stuInfoBasicIBLL.GetAllList();
+            ViewBag.StuInfoTotalNum = stuInfoData.Count();
+            //教师
+            var teacherData = empInfoIBLL.GetAllList();
+            ViewBag.TeacherTotalNum = teacherData.Count();
+            //教室
+            var classRoomData = classroomInfoIBLL.GetAllList();
+            ViewBag.ClassRoomTotalNum = classRoomData.Count();
+            //课程
+            var lessonData = lessonInfoIBLL.GetAllList();
+            ViewBag.LessonTotalNum = lessonData.Count();
+            //专业总览
+            //专业学生
+            var stuByMajor = stuInfoData.GroupBy(x => x.MajorNo).Select(x => new
+            {
+                value = x.Select(y => y.StuId).Count(),
+                name = cdMajorIBLL.GetCdMajorEntityByMajorNo(x.Key)?.MajorName
+            });
+            ViewBag.StuByMajorStr = JsonConvert.SerializeObject(stuByMajor);
+            //流程
+            var flowType = dataItemIBLL.GetDetailList("FlowSort", "");
+            var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList();
+            var allCount = 0;
+            foreach (var flow in flowType)
+            {
+                var count = flowList.Count(a => a.F_Category == flow.F_ItemName);
+                flow.FlowCount = count;
+                allCount += count;
+
+            }
+            ViewBag.AllCount = allCount;
+            ViewBag.FlowType = flowType;
+            ViewBag.FlowList = JsonConvert.SerializeObject(flowList);
+            //校园一卡通余额
+            ViewBag.StuSaveRecordTotalNum = 0;
+            var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE);
+            if (stuSaveRecordList.Any())
+            {
+                ViewBag.StuSaveRecordTotalNum = stuSaveRecordList.FirstOrDefault().ODDFARE;
+            }
+            //红湖付款码余额
+            ViewBag.StuConsumptionTotalNum = 0;
+            var stuConsumptionList = stuConsumptionIBLL.GetListByAccount(userInfo.account);
+            if (stuConsumptionList.Any())
+            {
+                ViewBag.StuConsumptionTotalNum = stuConsumptionList.Select(x => x.OPFARE.ToDecimal()).Sum();
+            }
+            //常用链接
+            var userfunctionlist = perm_FunctionIBLL.GetListByUserId(userInfo.userId);
+            var ff = userfunctionlist.GroupBy(x => x.FTName).Select(x => new Perm_FunctionEntity()
+            {
+                FTName = x.Key,
+                PFunctionList = x.Select(y => new Perm_FunctionEntity()
+                {
+                    FId = y.FId,
+                    FTId = y.FTId,
+                    FName = y.FName,
+                    UPId = DESEncrypt.Encrypt(y.FId, ConfigurationManager.AppSettings["SSOPublicSecret"]),//sysid
+                    UserId = DESEncrypt.Encrypt(userInfo.userId, ConfigurationManager.AppSettings["SSOPublicSecret"])//openid
+                }).Take(8).ToList()
+            });
+            ViewBag.FunctionList = ff;
+            ViewBag.FunctionListStr = JsonConvert.SerializeObject(ViewBag.FunctionList);
+
+
+            return View();
+        }
+
+        /// <summary>
+        /// 网上办事大厅拖拽版-效率优先模式
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult DragModelTwo()
+        {
+            //判断登录状态码
+            string account = "";
+            if (!Request.Headers["account"].IsEmpty())
+            {
+                account = Request.Headers["account"].ToString();
+            }
+            OperatorHelper helper = new OperatorHelper();
+            var result = helper.IsOnLine(account);
+            if (result.stateCode != 1)
+            {
+                return Redirect("DragNoLogin");
+            }
+            //登录用户
+            var userInfo = LoginUserInfo.Get();
+            ViewBag.UserId = userInfo.userId;
+            //桌面管理表、卡片块排序管理表增加默认数据
+            sSO_Drag_DesktopManageIBLL.AddDefaultData(userInfo.userId, "two");
+            //获取桌面、卡片块排序列表
+            ViewBag.DesktopList = sSO_Drag_DesktopManageIBLL.GetListByModelCode(userInfo.userId, "two").OrderByDescending(x => x.DefaultFlag).ThenBy(x => x.Sort).ThenBy(x => x.CreateDate);
+            ViewBag.DesktopListStr = JsonConvert.SerializeObject(ViewBag.DesktopList);
+            //分页查询条件设置
+            Pagination paginationobj = new Pagination() { rows = 5, page = 1, sidx = "readflag asc,SENDTIME desc ", sord = "desc" };
+            //邮件-收件箱
+            var maildata = sYS_ReceiveMessageIBLL.GetPageList(paginationobj, "{\"userId\":\"" + userInfo.userId + "\"}");
+            var maildataAll = sYS_ReceiveMessageIBLL.GetList("{\"userId\":\"" + userInfo.userId + "\"}");
+            ViewBag.LanMail = maildata;
+            ViewBag.LanMailStr = JsonConvert.SerializeObject(ViewBag.LanMail);
+            ViewBag.LanMailUnReadCount = maildataAll.Count(m => m.READFLAG == 0);
+            //邮件-已发送
+            paginationobj.sidx = "SENDTIME desc";
+            var mailsenddata = sYS_SendMessageIBLL.GetPageList(paginationobj, "{\"userId\":\"" + userInfo.userId + "\"}");
+            var mailsenddataAll = sYS_SendMessageIBLL.GetList2("{\"userId\":\"" + userInfo.userId + "\"}");
+            ViewBag.LanMailSend = mailsenddata;
+            ViewBag.LanMailSendStr = JsonConvert.SerializeObject(ViewBag.LanMailSend);
+            //来往邮件数量
+            ViewBag.LanMailTotalNum = maildataAll.Count() + mailsenddataAll.Count();
+            //公文
+            paginationobj.sidx = "SendTime";
+            ViewBag.ReceiveFileList = sys_ReceiveFileIBLL.GetPageList(paginationobj, "{\"ReceiverId\":\"" + userInfo.userId + "\"}");
+            ViewBag.ReceiveFileListStr = JsonConvert.SerializeObject(ViewBag.ReceiveFileList);
+            //公告
+            List<NewsEntity> outnewslist = new List<NewsEntity>();
+            var newsList = newsIBLL.GetList("", userInfo.userId);
+            foreach (var newsitemEntity in newsList)
+            {
+                if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId))
+                {
+                    if (!string.IsNullOrEmpty(userInfo.postIds))
+                    {
+                        if (userInfo.postIds.Contains(","))
+                        {
+                            foreach (var postid in userInfo.postIds.Split(','))
+                            {
+                                if (newsitemEntity.F_SendPostId.Contains(postid))
+                                {
+                                    outnewslist.Add(newsitemEntity);
+                                    break;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            if (newsitemEntity.F_SendPostId.Contains(userInfo.postIds))
+                            {
+                                outnewslist.Add(newsitemEntity);
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId))
+                    {
+                        if (newsitemEntity.F_SendDeptId.Contains(userInfo.departmentId))
+                        {
+                            outnewslist.Add(newsitemEntity);
+                        }
+                    }
+                    else
+                    {
+                        outnewslist.Add(newsitemEntity);
+                    }
+                }
+            }
+            ViewBag.NewsList = outnewslist.Take(5);
+            ViewBag.NewsListStr = JsonConvert.SerializeObject(ViewBag.NewsList);
+            //宣传报道
+            var newsListOfxuanchuan = outnewslist.Where(x => x.F_CategoryId == "15").Take(4);
+            foreach (var item in newsListOfxuanchuan)
+            {
+                if (!string.IsNullOrEmpty(item.F_NewsImage))
+                {
+                    var imagePath = annexesFileIBLL.GetEntityByFolderId(item.F_NewsImage)?.F_FilePath;
+                    if (!string.IsNullOrEmpty(imagePath))
+                    {
+                        item.F_NewsImage = imagePath.Substring(imagePath.IndexOf("Resource"));
+                    }
+                    else
+                    {
+                        item.F_NewsImage = "/Content/images/DragSSO/noLogin.png";
+                    }
+                }
+            }
+            ViewBag.NewsListOfxuanchuan = newsListOfxuanchuan;
+            ViewBag.NewsListOfxuanchuanStr = JsonConvert.SerializeObject(ViewBag.NewsListOfxuanchuan);
+            //智慧教育
+            ViewBag.NewsListOfzhihui = outnewslist.Where(x => x.F_CategoryId == "16").Take(6);
+            ViewBag.NewsListOfzhihuiStr = JsonConvert.SerializeObject(ViewBag.NewsListOfzhihui);
+            //专题推荐
+            var newsListOfzhuanti = outnewslist.Where(x => x.F_CategoryId == "17").Take(7);
+            foreach (var item in newsListOfzhuanti)
+            {
+                if (!string.IsNullOrEmpty(item.F_NewsImage))
+                {
+                    var imagePath = annexesFileIBLL.GetEntityByFolderId(item.F_NewsImage)?.F_FilePath;
+                    if (!string.IsNullOrEmpty(imagePath))
+                    {
+                        item.F_NewsImage = imagePath.Substring(imagePath.IndexOf("Resource"));
+                    }
+                    else
+                    {
+                        item.F_NewsImage = "/Content/images/DragSSO/noLogin.png";
+                    }
+                }
+            }
+            ViewBag.NewsListOfzhuanti = newsListOfzhuanti;
+            ViewBag.NewsListOfzhuantiStr = JsonConvert.SerializeObject(ViewBag.NewsListOfzhuanti);
+            //办公事项-待办任务
+            paginationobj.sidx = "F_CreateDate";
+            paginationobj.rows = 4;
+            var taskListAll = nWFProcessIBLL.GetMyTaskPageList(userInfo, "{}");
+            ViewBag.TaskList = nWFProcessIBLL.GetMyTaskPageList(userInfo, paginationobj, "{}");
+            ViewBag.TaskListStr = JsonConvert.SerializeObject(ViewBag.TaskList);
+            ViewBag.TaskTotalNum = taskListAll.Count();
+            //办公事项-已办任务
+            var finishTaskListAll = nWFProcessIBLL.GetMyFinishTaskPageList(userInfo, "{}");
+            ViewBag.FinishTaskList = nWFProcessIBLL.GetMyFinishTaskPageList(userInfo, paginationobj, "{}");
+            ViewBag.FinishTaskListStr = JsonConvert.SerializeObject(ViewBag.FinishTaskList);
+            ViewBag.FinishTaskTotalNum = finishTaskListAll.Count();
+            //办公事项-我发起的
+            var myListAll = nWFProcessIBLL.GetMyPageList(userInfo.userId, "{}");
+            ViewBag.MyList = nWFProcessIBLL.GetMyPageList(userInfo.userId, paginationobj, "{}");
+            ViewBag.MyListStr = JsonConvert.SerializeObject(ViewBag.MyList);
+            ViewBag.MyListTotalNum = myListAll.Count();
+            //常用服务
+            List<ModuleEntity> modulelist = new List<ModuleEntity>();
+            List<string> offenused = LogBLL.GetGroupLog(userInfo.userId).Select(m => m.F_Module).Take(20).ToList();
+            var moduledata = moduleIBLL.GetModuleList().Where(m => m.F_EnabledMark == 1 && m.F_DeleteMark == 0 && !string.IsNullOrEmpty(m.F_UrlAddress) && m.F_IsMenu == 1 && m.F_Target == "iframe" && !string.IsNullOrEmpty(m.F_ParentId));
+            foreach (var oitem in offenused)
+            {
+                ModuleEntity fod = moduledata.FirstOrDefault(m => m.F_FullName == oitem);
+                if (fod != null)
+                {
+                    //找父级
+                    if (fod.F_ParentId == "0")
+                    {
+                        fod.ParentName = fod.F_FullName;
+                        fod.F_ParentId = fod.F_ModuleId;
+                    }
+                    else
+                    {
+                        var parent1 = moduleIBLL.GetModuleEntity(fod.F_ParentId);
+                        if (parent1 != null)
+                        {
+                            if (parent1.F_ParentId == "0")
+                            {
+                                fod.ParentName = parent1.F_FullName;
+                                fod.F_ParentId = parent1.F_ModuleId;
+                            }
+                            else
+                            {
+                                //下一级
+                                var parent2 = moduleIBLL.GetModuleEntity(parent1.F_ParentId);
+                                if (parent2 != null)
+                                {
+                                    if (parent2.F_ParentId == "0")
+                                    {
+                                        fod.ParentName = parent2.F_FullName;
+                                        fod.F_ParentId = parent2.F_ModuleId;
+                                    }
+                                    else
+                                    {
+                                        //下一级
+                                        var parent3 = moduleIBLL.GetModuleEntity(parent2.F_ParentId);
+                                        if (parent3 != null)
+                                        {
+                                            if (parent3.F_ParentId == "0")
+                                            {
+                                                fod.ParentName = parent3.F_FullName;
+                                                fod.F_ParentId = parent3.F_ModuleId;
+                                            }
+                                            else
+                                            {
+                                                //下一级
+                                                var parent4 = moduleIBLL.GetModuleEntity(parent3.F_ParentId);
+                                                if (parent4 != null)
+                                                {
+                                                    if (parent4.F_ParentId == "0")
+                                                    {
+                                                        fod.ParentName = parent4.F_FullName;
+                                                        fod.F_ParentId = parent4.F_ModuleId;
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    modulelist.Add(fod);
+                }
+            }
+            ViewBag.OffenusedAll = modulelist;
+
+            var mm = modulelist.GroupBy(x => x.F_ParentId).Select(x => new ModuleEntity()
+            {
+                F_ParentId = x.Key,
+                ParentName = x.FirstOrDefault().ParentName,
+                ChildrenList = x.Select(y => new ModuleEntity()
+                {
+                    F_ModuleId = y.F_ModuleId,
+                    F_FullName = y.F_FullName
+                }).ToList()
+            }).ToList();
+            ViewBag.OffenusedGroup = mm;
+            ViewBag.OffenusedGroupStr = JsonConvert.SerializeObject(ViewBag.OffenusedGroup);
+            //todo:
+            //删begin
+            ViewBag.OffenusedJiao = modulelist.Where(x => x.F_FullName.Contains("教"));
+            ViewBag.OffenusedGuan = modulelist.Where(x => x.F_FullName.Contains("管理"));
+            ViewBag.Offenused = modulelist.Except(modulelist.Where(x => x.F_FullName.Contains("教") || x.F_FullName.Contains("管理"))).Take(6);
+            ViewBag.OffenusedJiaoStr = JsonConvert.SerializeObject(ViewBag.OffenusedJiao);
+            ViewBag.OffenusedGuanStr = JsonConvert.SerializeObject(ViewBag.OffenusedGuan);
+            ViewBag.OffenusedStr = JsonConvert.SerializeObject(ViewBag.Offenused);
+            //删end
+            //查找服务
+            List<ModuleEntity> searchmodulelist = new List<ModuleEntity>();
+            foreach (var item in moduledata)
+            {
+                if (moduleIBLL.GetColumnList(item.F_ModuleId).Any())
+                {
+                    item.FirstLetter = Str.PinYin(item.F_FullName).Substring(0, 1);
+                    searchmodulelist.Add(item);
+                }
+            }
+            ViewBag.SearchModule = searchmodulelist;
+            //校园总览
+            //专业
+            var majorData = cdMajorIBLL.GetAllList();
+            ViewBag.MajorTotalNum = majorData.Count();
+            //班级
+            var classInfoData = classInfoIBLL.GetAllClass();
+            ViewBag.ClassInfoTotalNum = classInfoData.Count();
+            //学生
+            var stuInfoData = stuInfoBasicIBLL.GetAllList();
+            ViewBag.StuInfoTotalNum = stuInfoData.Count();
+            //教师
+            var teacherData = empInfoIBLL.GetAllList();
+            ViewBag.TeacherTotalNum = teacherData.Count();
+            //教室
+            var classRoomData = classroomInfoIBLL.GetAllList();
+            ViewBag.ClassRoomTotalNum = classRoomData.Count();
+            //课程
+            var lessonData = lessonInfoIBLL.GetAllList();
+            ViewBag.LessonTotalNum = lessonData.Count();
+            //专业总览
+            //专业学生
+            var stuByMajor = stuInfoData.GroupBy(x => x.MajorNo).Select(x => new
+            {
+                value = x.Select(y => y.StuId).Count(),
+                name = cdMajorIBLL.GetCdMajorEntityByMajorNo(x.Key)?.MajorName
+            });
+            ViewBag.StuByMajorStr = JsonConvert.SerializeObject(stuByMajor);
+            //流程
+            var flowType = dataItemIBLL.GetDetailList("FlowSort", "");
+            var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList();
+            var allCount = 0;
+            foreach (var flow in flowType)
+            {
+                var count = flowList.Count(a => a.F_Category == flow.F_ItemName);
+                flow.FlowCount = count;
+                allCount += count;
+
+            }
+            ViewBag.AllCount = allCount;
+            ViewBag.FlowType = flowType;
+            ViewBag.FlowList = JsonConvert.SerializeObject(flowList);
+            //校园一卡通余额
+            ViewBag.StuSaveRecordTotalNum = 0;
+            var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE);
+            if (stuSaveRecordList.Any())
+            {
+                ViewBag.StuSaveRecordTotalNum = stuSaveRecordList.FirstOrDefault().ODDFARE;
+            }
+            //红湖付款码余额
+            ViewBag.StuConsumptionTotalNum = 0;
+            var stuConsumptionList = stuConsumptionIBLL.GetListByAccount(userInfo.account);
+            if (stuConsumptionList.Any())
+            {
+                ViewBag.StuConsumptionTotalNum = stuConsumptionList.Select(x => x.OPFARE.ToDecimal()).Sum();
+            }
+            //常用链接
+            var userfunctionlist = perm_FunctionIBLL.GetListByUserId(userInfo.userId);
+            var ff = userfunctionlist.GroupBy(x => x.FTName).Select(x => new Perm_FunctionEntity()
+            {
+                FTName = x.Key,
+                PFunctionList = x.Select(y => new Perm_FunctionEntity()
+                {
+                    FId = y.FId,
+                    FTId = y.FTId,
+                    FName = y.FName,
+                    UPId = DESEncrypt.Encrypt(y.FId, ConfigurationManager.AppSettings["SSOPublicSecret"]),//sysid
+                    UserId = DESEncrypt.Encrypt(userInfo.userId, ConfigurationManager.AppSettings["SSOPublicSecret"])//openid
+                }).Take(8).ToList()
+            });
+            ViewBag.FunctionList = ff;
+            ViewBag.FunctionListStr = JsonConvert.SerializeObject(ViewBag.FunctionList);
+
+
+            return View();
+        }
+        /// <summary>
+        /// 网上办事大厅拖拽版-管理驾驶舱模式
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult DragModelThree()
+        {
+            //判断登录状态码
+            string account = "";
+            if (!Request.Headers["account"].IsEmpty())
+            {
+                account = Request.Headers["account"].ToString();
+            }
+            OperatorHelper helper = new OperatorHelper();
+            var result = helper.IsOnLine(account);
+            if (result.stateCode != 1)
+            {
+                return Redirect("DragNoLogin");
+            }
+            //登录用户
+            var userInfo = LoginUserInfo.Get();
+            ViewBag.UserId = userInfo.userId;
+            //校园总览
+            //专业
+            var majorData = cdMajorIBLL.GetAllList();
+            ViewBag.MajorTotalNum = majorData.Count();
+            //班级
+            var classInfoData = classInfoIBLL.GetAllClass();
+            ViewBag.ClassInfoTotalNum = classInfoData.Count();
+            //学生
+            var stuInfoData = stuInfoBasicIBLL.GetAllList();
+            ViewBag.StuInfoTotalNum = stuInfoData.Count();
+            ViewBag.StuInfoTotalNumOfMan = stuInfoData.Where(x => x.GenderNo == true).Count();
+            //教师
+            var teacherData = empInfoIBLL.GetAllList();
+            ViewBag.TeacherTotalNum = teacherData.Count();
+            ViewBag.TeacherTotalNumOfMan = teacherData.Where(x => x.GenderNo == true).Count();
+            ViewBag.TeacherTotalNumOfBianNei = teacherData.Where(x => x.CompilationCategory == "01").Count();
+            //教室
+            var classRoomData = classroomInfoIBLL.GetAllList();
+            ViewBag.ClassRoomTotalNum = classRoomData.Count();
+            //专业总览
+            //专业学生
+            var stuByMajor = stuInfoData.GroupBy(x => x.MajorNo).Select(x => new
+            {
+                value = x.Select(y => y.StuId).Count(),
+                name = cdMajorIBLL.GetCdMajorEntityByMajorNo(x.Key)?.MajorName
+            });
+            ViewBag.StuByMajorStr = JsonConvert.SerializeObject(stuByMajor);
+            //流程
+            var flowType = dataItemIBLL.GetDetailList("FlowSort", "");
+            var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList();
+            var allCount = 0;
+            foreach (var flow in flowType)
+            {
+                var count = flowList.Count(a => a.F_Category == flow.F_ItemName);
+                flow.FlowCount = count;
+                allCount += count;
+
+            }
+            ViewBag.AllCount = allCount;
+            ViewBag.FlowType = flowType;
+            ViewBag.FlowList = JsonConvert.SerializeObject(flowList);
+            //课程总览
+            var lessonInfoData = lessonInfoIBLL.GetAllList();
+            ViewBag.LessonTotalNum = lessonInfoData.Count();
+            ViewBag.OpenLessonTotalNum = lessonInfoData.Where(x => x.CheckMark == true).Count();
+            //课程分类下的课程
+            var lessonBySort = lessonInfoData.GroupBy(x => x.LessonSortNo).Select(x => new
+            {
+                value = x.Select(y => y.LessonId).Count(),
+                name = cdLessonSortIBLL.GetCdLessonSortEntityByNo(x.Key)?.LessonSortName
+            });
+            ViewBag.LessonBySortStr = JsonConvert.SerializeObject(lessonBySort);
+            //课程类型下的课程
+            var lessonByType = lessonInfoData.GroupBy(x => x.LessonTypeId).Select(x => new
+            {
+                value = x.Select(y => y.LessonId).Count(),
+                name = cdLessonTypeIBLL.GetCdLessonTypeEntity(x.Key)?.LessonTypeName
+            });
+            ViewBag.LessonByTypeStr = JsonConvert.SerializeObject(lessonByType);
+            //教师总览
+            //教师学历比例
+            var teacherByHighestRecord = teacherData.Where(x => !string.IsNullOrEmpty(x.HighestRecord)).GroupBy(x => x.HighestRecord).Select(x => new
+            {
+                value = x.Select(y => y.EmpId).Count(),
+                name = bCdCultureDegreeIBLL.GetEntity(x.Key)?.CultureDegree
+            }).OrderByDescending(x => x.value);
+            ViewBag.TeacherByHighestRecordStr = JsonConvert.SerializeObject(teacherByHighestRecord);
+            //教师年龄比例
+            var empInfoAgeRate = empInfoIBLL.GetEmpInfoAgeRate();
+            var teacherByAge = new List<object>() {
+                new { value = empInfoAgeRate.age1, name = "60岁以上" },
+                new { value = empInfoAgeRate.age2, name = "50~60岁" },
+                new { value = empInfoAgeRate.age3, name = "40~50岁" },
+                new { value = empInfoAgeRate.age4, name = "30~40岁" },
+                new { value = empInfoAgeRate.age5, name = "20~30岁" },
+            };
+            ViewBag.TeacherByAgeStr = JsonConvert.SerializeObject(teacherByAge);
+            //学生总览
+            //学生成绩预警
+            var stuScoreData = stuScoreNotPassIBLL.GetList("{}").Where(x => x.Score == 0).Select(x => new { x.StuNo, x.MajorNo }).Distinct();
+            ViewBag.StuScoreWarnTotalNum = stuScoreData.Count();
+            var stuScoreByMajor = stuScoreData.GroupBy(x => x.MajorNo).Select(x => new
+            {
+                value = x.Select(y => y.StuNo).Count(),
+                name = cdMajorIBLL.GetCdMajorEntityByMajorNo(x.Key)?.MajorName
+            });
+            ViewBag.StuScoreByMajorStr = JsonConvert.SerializeObject(stuScoreByMajor);
+            //常用服务
+            List<ModuleEntity> modulelist = new List<ModuleEntity>();
+            List<string> offenused = LogBLL.GetGroupLog(userInfo.userId).Select(m => m.F_Module).Take(20).ToList();
+            var moduledata = moduleIBLL.GetModuleList().Where(m => m.F_EnabledMark == 1 && m.F_DeleteMark == 0 && !string.IsNullOrEmpty(m.F_UrlAddress) && m.F_IsMenu == 1 && m.F_Target == "iframe" && !string.IsNullOrEmpty(m.F_ParentId));
+            foreach (var oitem in offenused)
+            {
+                ModuleEntity fod = moduledata.FirstOrDefault(m => m.F_FullName == oitem);
+                if (fod != null)
+                {
+                    //找父级
+                    if (fod.F_ParentId == "0")
+                    {
+                        fod.ParentName = fod.F_FullName;
+                        fod.F_ParentId = fod.F_ModuleId;
+                    }
+                    else
+                    {
+                        var parent1 = moduleIBLL.GetModuleEntity(fod.F_ParentId);
+                        if (parent1 != null)
+                        {
+                            if (parent1.F_ParentId == "0")
+                            {
+                                fod.ParentName = parent1.F_FullName;
+                                fod.F_ParentId = parent1.F_ModuleId;
+                            }
+                            else
+                            {
+                                //下一级
+                                var parent2 = moduleIBLL.GetModuleEntity(parent1.F_ParentId);
+                                if (parent2 != null)
+                                {
+                                    if (parent2.F_ParentId == "0")
+                                    {
+                                        fod.ParentName = parent2.F_FullName;
+                                        fod.F_ParentId = parent2.F_ModuleId;
+                                    }
+                                    else
+                                    {
+                                        //下一级
+                                        var parent3 = moduleIBLL.GetModuleEntity(parent2.F_ParentId);
+                                        if (parent3 != null)
+                                        {
+                                            if (parent3.F_ParentId == "0")
+                                            {
+                                                fod.ParentName = parent3.F_FullName;
+                                                fod.F_ParentId = parent3.F_ModuleId;
+                                            }
+                                            else
+                                            {
+                                                //下一级
+                                                var parent4 = moduleIBLL.GetModuleEntity(parent3.F_ParentId);
+                                                if (parent4 != null)
+                                                {
+                                                    if (parent4.F_ParentId == "0")
+                                                    {
+                                                        fod.ParentName = parent4.F_FullName;
+                                                        fod.F_ParentId = parent4.F_ModuleId;
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    modulelist.Add(fod);
+                }
+            }
+            ViewBag.OffenusedAll = modulelist;
+            //查找服务
+            List<ModuleEntity> searchmodulelist = new List<ModuleEntity>();
+            foreach (var item in moduledata)
+            {
+                if (moduleIBLL.GetColumnList(item.F_ModuleId).Any())
+                {
+                    item.FirstLetter = Str.PinYin(item.F_FullName).Substring(0, 1);
+                    searchmodulelist.Add(item);
+                }
+            }
+            ViewBag.SearchModule = searchmodulelist;
+
+
+            return View();
+        }
+        /// <summary>
+        /// 网上办事大厅拖拽版-保存卡片块排序
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult SaveCardSort(string userId, string modelCode, string desktopId, string cardSort)
+        {
+            sSO_Drag_CardSortManageIBLL.SaveCardSort(userId, modelCode, desktopId, cardSort);
+            return Success("操作成功");
+        }
+
+        /// <summary>
+        /// 网上办事大厅拖拽版-新增桌面
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult AddDesktop(string userId, string modelCode, string desktopName, string desktopCode)
+        {
+            sSO_Drag_DesktopManageIBLL.AddDesktop(userId, modelCode, desktopName, desktopCode);
+            var data = sSO_Drag_DesktopManageIBLL.GetEntityByDesktopCode(userId, modelCode, desktopCode);
+            return Success("操作成功", data);
+        }
+
+        /// <summary>
+        /// 网上办事大厅拖拽版-删除桌面
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult DeleteDesktop(string desktopId)
+        {
+            sSO_Drag_DesktopManageIBLL.DeleteEntity(desktopId);
+            return Success("操作成功");
+        }
+
+        /// <summary>
+        /// 网上办事大厅拖拽版-修改桌面
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult ModifyDesktop(string desktopId, string desktopName)
+        {
+            var entity = new SSO_Drag_DesktopManageEntity()
+            {
+                DesktopName = desktopName
+            };
+            sSO_Drag_DesktopManageIBLL.SaveEntity(desktopId, entity);
+            return Success("操作成功");
+        }
+
+        /// <summary>
+        /// 网上办事大厅拖拽版-默认桌面恢复默认设置
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult RestoreDefaultDesktop(string desktopId)
+        {
+            sSO_Drag_DesktopManageIBLL.RestoreDefaultDesktop(desktopId);
+            return Success("操作成功");
+        }
+
     }
 }

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

@@ -391,6 +391,8 @@
     <Compile Include="Areas\LR_Desktop\Controllers\DTSettingController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\DTTargetController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\MessageRindController.cs" />
+    <Compile Include="Areas\LR_Desktop\Controllers\SSO_Drag_CardSortManageController.cs" />
+    <Compile Include="Areas\LR_Desktop\Controllers\SSO_Drag_DesktopManageController.cs" />
     <Compile Include="Areas\LR_Desktop\Controllers\WeChatDevelopController.cs" />
     <Compile Include="Areas\LR_Desktop\LR_DesktopAreaRegistration.cs" />
     <Compile Include="Areas\LR_DisplayBoard\Controllers\LR_KBConfigInfoController.cs" />
@@ -1257,6 +1259,10 @@
     <Content Include="Areas\LR_Desktop\Views\DTSetting\PC\PcIndex.js" />
     <Content Include="Areas\LR_Desktop\Views\MessageRind\Form.js" />
     <Content Include="Areas\LR_Desktop\Views\MessageRind\Index.js" />
+    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_CardSortManage\Form.js" />
+    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_CardSortManage\Index.js" />
+    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_DesktopManage\Form.js" />
+    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_DesktopManage\Index.js" />
     <Content Include="Areas\LR_Desktop\Views\WeChatDevelop\Form.js" />
     <Content Include="Areas\LR_Desktop\Views\WeChatDevelop\Index.js" />
     <Content Include="Areas\LR_DisplayBoard\Views\LR_KBConfigInfo\ChartForm.css" />
@@ -6972,6 +6978,10 @@
     <Content Include="Areas\EducationalAdministration\Views\Sys_DefaultPwdConfig\Index.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\EpidemicSituationCopy\FormView.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\EpidemicSituationCopy\IndexAll.cshtml" />
+    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_CardSortManage\Form.cshtml" />
+    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_CardSortManage\Index.cshtml" />
+    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_DesktopManage\Form.cshtml" />
+    <Content Include="Areas\LR_Desktop\Views\SSO_Drag_DesktopManage\Index.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />
@@ -7042,6 +7052,12 @@
     <Content Include="Views\Login\PageTwoWxLogin.cshtml" />
     <Content Include="Views\Home\SSOApplication.cshtml" />
     <Content Include="Views\Home\GoToApplication.cshtml" />
+    <Content Include="Views\SSOSystem\DragModelOne.cshtml" />
+    <Content Include="Views\SSOSystem\DragModelThree.cshtml" />
+    <Content Include="Views\SSOSystem\DragModelTwo.cshtml" />
+    <Content Include="Views\SSOSystem\DragNoLogin.cshtml" />
+    <Content Include="Views\SSOSystem\DragNoWxLogin.cshtml" />
+    <Content Include="Views\SSOSystem\_LayoutSSODrag.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Connected Services\" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelThree.cshtml

@@ -0,0 +1,709 @@
+@using Learun.Application.OA
+@using Learun.Application.Base.SystemModule
+@using Learun.Application.TwoDevelopment.EducationalAdministration
+@using Learun.Application.TwoDevelopment.Permission
+@using Learun.Application.WorkFlow
+@using Learun.Util
+@using Learun.Application.TwoDevelopment.LR_Desktop
+
+
+@{
+    ViewBag.Title = "网上办事大厅拖拽版";
+    Layout = "~/Views/SSOSystem/_LayoutSSODrag.cshtml";
+}
+
+<link rel="stylesheet" type="text/css" href="/Content/css/DragSSO/index3.css" />
+<style>
+    .searchLi > a{
+        width:100%;
+    }
+    .searchLi > a > *{
+        display:inline-block;
+        vertical-align:middle;
+    } 
+</style>
+<script>
+    var randomFun = function (x, y) {
+        var aa = parseInt(Math.random() * (x - y + 1) + y);
+        return aa;
+    };
+    //console.log(randomFun(5, 0));
+
+    //图表数据
+    //专业总览
+    //---班级总数
+    var ClassInfoTotalNum = "@ViewBag.ClassInfoTotalNum";
+    //---专业学生
+    var StuByMajorStr = "@ViewBag.StuByMajorStr";
+    var StuByMajor = JSON.parse(StuByMajorStr.replace(/&quot;/g, "\""));
+    //---专业教室
+    var ClassRoomTotalNum = "@ViewBag.ClassRoomTotalNum";
+    //课程总览
+    //---课程分类下的课程
+    var LessonBySortStr = "@ViewBag.LessonBySortStr";
+    var LessonBySort = JSON.parse(LessonBySortStr.replace(/&quot;/g, "\""));
+    //---课程类型下的课程
+    var LessonByTypeStr = "@ViewBag.LessonByTypeStr";
+    var LessonByType = JSON.parse(LessonByTypeStr.replace(/&quot;/g, "\""));
+    //教师总览
+    //---教师学历比例
+    var TeacherByHighestRecordStr = "@ViewBag.TeacherByHighestRecordStr";
+    var TeacherByHighestRecord = JSON.parse(TeacherByHighestRecordStr.replace(/&quot;/g, "\""));
+    //---教师年龄比例
+    var TeacherByAgeStr = "@ViewBag.TeacherByAgeStr";
+    var TeacherByAge = JSON.parse(TeacherByAgeStr.replace(/&quot;/g, "\""));
+    //学生总览
+    //---学生成绩预警
+    var StuScoreByMajorStr = "@ViewBag.StuScoreByMajorStr";
+    var StuScoreByMajor = JSON.parse(StuScoreByMajorStr.replace(/&quot;/g, "\""));
+
+
+</script>
+<!--  / warpper  -->
+<div class="warpper">
+    <!-- search -->
+    <div class="search">
+        <div class="searchL">
+            <div class="searchLT">最近使用</div>
+            <ul class="searchLList">
+                @{
+                    Random rd = new Random();
+                    foreach (ModuleEntity item in ViewBag.OffenusedAll)
+                    {
+                        <li>
+                            <a href="/Home/Index?autoopen=@item.F_ModuleId" target="_blank">
+                                <img src="~/Content/images/DragSSO/inSec1-@(rd.Next(2, 22)).png" alt=""><span>@item.F_FullName</span>
+                            </a>
+                        </li>
+                    }
+                }
+            </ul>
+        </div>
+        <div class="searchR">
+            @*<div class="searchTop">
+                <span>服务角色</span>
+                <ul class="searchTopList">
+                    <li class="active">全部</li>
+                    <li>校领导</li>
+                    <li>游客</li>
+                    <li>教师</li>
+                    <li>学生</li>
+                </ul>
+            </div>
+            <div class="searchTop">
+                <span>服务角色</span>
+                <ul class="searchTopList">
+                    <li class="active">全部</li>
+                    <li>最新应用</li>
+                    <li>常用链接</li>
+                </ul>
+            </div>*@
+            <div class="searchRBox">
+                @{
+                    var searchModule = ViewBag.SearchModule as List<ModuleEntity>;
+
+                    <div class="searchRTop">
+                        <b>A-D</b> (<span>@searchModule.Where(x => "abcd".Contains(x.FirstLetter)).Count()</span>)
+                    </div>
+                    <div class="searchList clearfix">
+                        @{
+                            foreach (var item in searchModule.Where(x => "abcd".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter))
+                            {
+                                <div class="searchLi">
+                                    <a href="/Home/Index?autoopen=@item.F_ModuleId" target="_blank">
+                                        <div class="searchLiImg"><img src="~/Content/images/DragSSO/inSec1-@(rd.Next(2,22)).png" alt=""></div>
+                                        <div class="searchLiTxt">@item.F_FullName</div>
+                                    </a>
+                                </div>
+                            }
+                        }
+                    </div>
+                    <div class="searchRTop">
+                        <b>E-H</b> (<span>@searchModule.Where(x => "efgh".Contains(x.FirstLetter)).Count()</span>)
+                    </div>
+                    <div class="searchList clearfix">
+                        @{
+                            foreach (var item in searchModule.Where(x => "efgh".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter))
+                            {
+                                <div class="searchLi">
+                                    <a href="/Home/Index?autoopen=@item.F_ModuleId" target="_blank">
+                                        <div class="searchLiImg"><img src="~/Content/images/DragSSO/inSec1-@(rd.Next(2,22)).png" alt=""></div>
+                                        <div class="searchLiTxt">@item.F_FullName</div>
+                                    </a>
+                                </div>
+                            }
+                        }
+                    </div>
+                    <div class="searchRTop">
+                        <b>I-L</b> (<span>@searchModule.Where(x => "ijkl".Contains(x.FirstLetter)).Count()</span>)
+                    </div>
+                    <div class="searchList clearfix">
+                        @{
+                            foreach (var item in searchModule.Where(x => "ijkl".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter))
+                            {
+                                <div class="searchLi">
+                                    <a href="/Home/Index?autoopen=@item.F_ModuleId" target="_blank">
+                                        <div class="searchLiImg"><img src="~/Content/images/DragSSO/inSec1-@(rd.Next(2,22)).png" alt=""></div>
+                                        <div class="searchLiTxt">@item.F_FullName</div>
+                                    </a>
+                                </div>
+                            }
+                        }
+                    </div>
+                    <div class="searchRTop">
+                        <b>M-P</b> (<span>@searchModule.Where(x => "mnop".Contains(x.FirstLetter)).Count()</span>)
+                    </div>
+                    <div class="searchList clearfix">
+                        @{
+                            foreach (var item in searchModule.Where(x => "mnop".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter))
+                            {
+                                <div class="searchLi">
+                                    <a href="/Home/Index?autoopen=@item.F_ModuleId" target="_blank">
+                                        <div class="searchLiImg"><img src="~/Content/images/DragSSO/inSec1-@(rd.Next(2,22)).png" alt=""></div>
+                                        <div class="searchLiTxt">@item.F_FullName</div>
+                                    </a>
+                                </div>
+                            }
+                        }
+                    </div>
+                    <div class="searchRTop">
+                        <b>Q-T</b> (<span>@searchModule.Where(x => "qrst".Contains(x.FirstLetter)).Count()</span>)
+                    </div>
+                    <div class="searchList clearfix">
+                        @{
+                            foreach (var item in searchModule.Where(x => "qrst".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter))
+                            {
+                                <div class="searchLi">
+                                    <a href="/Home/Index?autoopen=@item.F_ModuleId" target="_blank">
+                                        <div class="searchLiImg"><img src="~/Content/images/DragSSO/inSec1-@(rd.Next(2,22)).png" alt=""></div>
+                                        <div class="searchLiTxt">@item.F_FullName</div>
+                                    </a>
+                                </div>
+                            }
+                        }
+                    </div>
+                    <div class="searchRTop">
+                        <b>U-X</b> (<span>@searchModule.Where(x => "uvwx".Contains(x.FirstLetter)).Count()</span>)
+                    </div>
+                    <div class="searchList clearfix">
+                        @{
+                            foreach (var item in searchModule.Where(x => "uvwx".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter))
+                            {
+                                <div class="searchLi">
+                                    <a href="/Home/Index?autoopen=@item.F_ModuleId" target="_blank">
+                                        <div class="searchLiImg"><img src="~/Content/images/DragSSO/inSec1-@(rd.Next(2,22)).png" alt=""></div>
+                                        <div class="searchLiTxt">@item.F_FullName</div>
+                                    </a>
+                                </div>
+                            }
+                        }
+                    </div>
+                    <div class="searchRTop">
+                        <b>Y-Z</b> (<span>@searchModule.Where(x => "yz".Contains(x.FirstLetter)).Count()</span>)
+                    </div>
+                    <div class="searchList clearfix">
+                        @{
+                            foreach (var item in searchModule.Where(x => "yz".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter))
+                            {
+                                <div class="searchLi">
+                                    <a href="/Home/Index?autoopen=@item.F_ModuleId" target="_blank">
+                                        <div class="searchLiImg"><img src="~/Content/images/DragSSO/inSec1-@(rd.Next(2,22)).png" alt=""></div>
+                                        <div class="searchLiTxt">@item.F_FullName</div>
+                                    </a>
+                                </div>
+                            }
+                        }
+                    </div>
+                }
+
+            </div>
+        </div>
+    </div>
+    <!-- search -->
+    <!--  / index_sec1  -->
+    <div class="index_sec index_sec1">
+        <div class="inSecLeftBox">
+            <div class="inSecLeftCon">
+                <div class="inSecLeftImg">
+                    <img src="/Content/images/DragSSO/indSec1-1.png" alt="">
+                    <img src="/Content/images/DragSSO/indSec1-2.png" alt="">
+                </div>
+                <div class="inSecLeftTxt">我的收藏</div>
+            </div>
+            <div class="inSecLeftCon">
+                <div class="inSecLeftImg">
+                    <img src="/Content/images/DragSSO/indSec1-3.png" alt="">
+                    <img src="/Content/images/DragSSO/indSec1-4.png" alt="">
+                </div>
+                <div class="inSecLeftTxt">可用应用</div>
+            </div>
+        </div>
+        <div class="indexSec1Con inSecShadow">
+            <div class="aLeft">
+                <i class="fa fa-angle-left"></i>
+            </div>
+            <div class="inSec1Tab">
+                <div class="inSec1TabBox">
+                    <img src="/Content/images/DragSSO/indSec1-1.png" alt="">
+                    <span>我的收藏</span>
+                </div>
+                <div class="inSec1TabBox">
+                    <img src="/Content/images/DragSSO/indSec1-3.png" alt="">
+                    <span>可用应用</span>
+                </div>
+            </div>
+            <div class="indSec1Line"></div>
+            <div class="indSec1Box">
+                <div class="inSec1Box">
+                    <!-- 第一级列表 -->
+                    <ul class="inSec1List1">
+                        <li class="active">
+                            <a href="#">
+                                <span>全部</span> <span>0</span>
+                            </a>
+                        </li>
+                    </ul>
+                    <!-- 第一级列表 -->
+                    <!-- 第二级列表 -->
+                    <ul class="inSec1List2 inSecShadow">
+                        @*<li class="active">
+                            <a href="/Home/Index?autoopen=92a85055-67f2-4a06-902a-f10ec5576d92" target="_blank">
+                                <img src="/Content/images/DragSSO/inSec1-2.png" alt="" /><span>人事管理系统</span>
+                            </a>
+                        </li>*@
+                    </ul>
+                    <!-- 第二级列表 -->
+                </div>
+                <div class="inSec1Box">
+                    <!-- 第一级列表 -->
+                    <ul class="inSec1List1" id="flowTypeList">
+                        <li class="active">
+                            <a href="#" class="itemName" itemName="全部">
+                                <span>全部</span> <span>@ViewBag.AllCount</span>
+                            </a>
+                        </li>
+                        @foreach (DataItemDetailEntity item in ViewBag.FlowType)
+                        {
+                            <li>
+                                <a href="#" class="itemName" itemName="@item.F_ItemName">
+                                    <span>@item.F_ItemName</span>  <span>@item.FlowCount</span>
+                                </a>
+                            </li>
+                        }
+                    </ul>
+                    <!-- 第一级列表 -->
+                    <!-- 第二级列表 -->
+                    <ul class="inSec1List2 inSecShadow" id="flowList"></ul>
+                    <!-- 第二级列表 -->
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--  / index_sec1  -->
+    <!--  / index_sec3  -->
+    <div class="index_sec index_sec3">
+        <form class="layui-form" action="">
+            <div class="indexSec3Box">
+                <div class="inSec3Row clearfix">
+                    <div class="inSec3Col6" id="id_4">
+                        <div class="inSec3Box">
+                            <div class="inSecT">
+                                <span>专业总览</span>
+                                <a href="#" class="more"><span></span><span></span><span></span></a>
+                            </div>
+                            <div class="inSec3Con">
+                                <div class="echartBox" id="major"></div>
+                                <div class="inSec3majorTxt inSec3majorTxt1">
+                                    <div>班级总数</div>
+                                    <div>@ViewBag.ClassInfoTotalNum</div>
+                                </div>
+                                <div class="inSec3majorTxt inSec3majorTxt2">
+                                    <div>专业学生</div>
+                                    <div>@ViewBag.StuInfoTotalNum</div>
+                                </div>
+                                <div class="inSec3majorTxt inSec3majorTxt3">
+                                    <div>专业教室</div>
+                                    <div>@ViewBag.ClassRoomTotalNum</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="inSec3Col6">
+                        <div class="inSec3Box">
+                            <div class="inSecT">
+                                <span>学生总览</span>
+                                <a href="#" class="more"><span></span><span></span><span></span></a>
+                            </div>
+                            <div class="inSec3Con teacherBox">
+                                <div class="teacherCon">
+                                    <div class="in3Sec3Total">在校学生总数 <b>@ViewBag.StuInfoTotalNum</b> 人</div>
+                                    <div class="in3Sec3PerBox">
+                                        <div class="in3Sec3Per">
+                                            男 <b>@ViewBag.StuInfoTotalNumOfMan</b> 人 <div class="in3Sec3Icon in3Sec3Green" id="StuInfoOfManRate"></div>
+                                        </div>
+                                    </div>
+                                    <div class="in3Sec3PerBox">
+                                        <div class="in3Sec3Per">
+                                            女 <b>@(ViewBag.StuInfoTotalNum - ViewBag.StuInfoTotalNumOfMan)</b> 人 <div class="in3Sec3Icon in3Sec3Red" id="StuInfoOfWomanRate"></div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="in3Sec3Echart1Box">
+                                    <div class="in3Sec3Echart1Con1">
+                                        <div>学生成绩预警</div>
+                                        <div><b>@ViewBag.StuScoreWarnTotalNum 人</b></div>
+                                    </div>
+                                    <img src="/Content/images/DragSSO/inSec6-3.png" class="in3Sec3Echart1Img1" alt="">
+                                    <div class="echartBox" id="achWarn"></div>
+                                </div>
+                                <div class="in3Sec3Echart1Box">
+                                    <div class="in3Sec3Echart1Con2">
+                                        学生到课率预警<b>20%</b>
+                                    </div>
+                                    <div class="echartBox" id="">
+                                        <div class="toClass">
+                                            <img class="toClassImg1" src="/Content/images/DragSSO/inSec6-5.png" alt="">
+                                            <div class="toClassImg2">
+                                                <img src="/Content/images/DragSSO/inSec6-6.png" alt="">
+                                            </div>
+                                            <div class="toClassBl"></div>
+                                        </div>
+                                        <div class="toClassLegend">
+                                            <div class="red">
+                                                <i></i><span>80%~100%</span>
+                                            </div>
+                                            <div class="blue">
+                                                <i></i><span>60%~80%</span>
+                                            </div>
+                                            <div class="green">
+                                                <i></i><span>0%~60%</span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="in3Sec3Echart1Box">
+                                    <div class="in3Sec3Echart1Con3">
+                                        <div>学生逃课预警</div>
+                                        <div><b><span id="StuInfoOfTaoKe"></span>人</b></div>
+                                    </div>
+                                    <div class="echartBox" id="skipClass"></div>
+                                    <div class="toClassLegend">
+                                        <div class="red">
+                                            <i></i><span>80%~100%</span>
+                                        </div>
+                                        <div class="blue">
+                                            <i></i><span>60%~80%</span>
+                                        </div>
+                                        <div class="green">
+                                            <i></i><span>0%~60%</span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="inSec3Col6" id="id_7">
+                        <div class="inSec3Box">
+                            <div class="inSecT">
+                                <span>校园总览</span>
+                                <a href="#" class="more"><span></span><span></span><span></span></a>
+                            </div>
+                            <div class="inSec3Con">
+                                <div class="overviewBox">
+                                    <div class="overviewImg">
+                                        <img src="/Content/images/DragSSO/indexSec3-23.png" alt="">
+                                        <span>专业总数</span>
+                                    </div>
+                                    <div class="overviewTxt">@ViewBag.MajorTotalNum</div>
+                                </div>
+                                <div class="overviewBox">
+                                    <div class="overviewImg">
+                                        <img src="/Content/images/DragSSO/indexSec3-24.png" alt="">
+                                        <span>班级总数</span>
+                                    </div>
+                                    <div class="overviewTxt">@ViewBag.ClassInfoTotalNum</div>
+                                </div>
+                                <div class="overviewBox">
+                                    <div class="overviewImg">
+                                        <img src="/Content/images/DragSSO/indexSec3-25.png" alt="">
+                                        <span>在校学生</span>
+                                    </div>
+                                    <div class="overviewTxt">@ViewBag.StuInfoTotalNum</div>
+                                </div>
+                                <div class="overviewBox">
+                                    <div class="overviewImg">
+                                        <img src="/Content/images/DragSSO/indexSec3-26.png" alt="">
+                                        <span>在校教师</span>
+                                    </div>
+                                    <div class="overviewTxt">@ViewBag.TeacherTotalNum</div>
+                                </div>
+                                <div class="overviewBox">
+                                    <div class="overviewImg">
+                                        <img src="/Content/images/DragSSO/indexSec3-27.png" alt="">
+                                        <span>在用教室</span>
+                                    </div>
+                                    <div class="overviewTxt">@ViewBag.ClassRoomTotalNum</div>
+                                </div>
+                                <div class="overviewBox">
+                                    <div class="overviewImg">
+                                        <img src="/Content/images/DragSSO/indexSec3-28.png" alt="">
+                                        <span>课程总数</span>
+                                    </div>
+                                    <div class="overviewTxt">@ViewBag.LessonTotalNum</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="inSec3Col6">
+                        <div class="inSec3Box">
+                            <div class="inSecT">
+                                <span>教师总览</span>
+                                <a href="#" class="more"><span></span><span></span><span></span></a>
+                            </div>
+                            <div class="inSec3Con teacherBox">
+                                <div class="teacherCon">
+                                    <div class="in3Sec3Total">教师总数 <b>@ViewBag.TeacherTotalNum</b> 人</div>
+                                    <div class="in3Sec3PerBox">
+                                        <div class="in3Sec3Per">
+                                            男 <b>@ViewBag.TeacherTotalNumOfMan</b> 人 <div class="in3Sec3Icon in3Sec3Green" id="TeacherOfManRate"></div>
+                                        </div>
+                                    </div>
+                                    <div class="in3Sec3PerBox">
+                                        <div class="in3Sec3Per">
+                                            女 <b>@(ViewBag.TeacherTotalNum - ViewBag.TeacherTotalNumOfMan)</b> 人 <div class="in3Sec3Icon in3Sec3Red" id="TeacherOfWomanRate"></div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="in3Sec3Echart1Box">
+                                    <div class="echartBox" id="age"></div>
+                                    <div class="ageTxt">教师年龄<br>比例</div>
+                                </div>
+                                <div class="in3Sec3Echart1Box">
+                                    <div class="in3Sec3Echart1Con">
+                                        <div>教师学历比例</div>
+                                    </div>
+                                    <div class="echartBox" id="education"></div>
+                                </div>
+                                <div class="in3Sec3Echart1Box">
+                                    <div class="organT">教师编制比例</div>
+                                    <div class="organBox">
+                                        <div class="organLine">
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div class="organZ" style="height: 30%;"></div>
+                                            <div class="organCon organCon1">
+                                                <div>在编教师</div>
+                                                <div><span>@ViewBag.TeacherTotalNumOfBianNei</span>人</div>
+                                                <div><span id="TeacherOfBianNeiRate"></span></div>
+                                            </div>
+                                            <div class="organCon organCon2">
+                                                <div>非在编教师</div>
+                                                <div><span>@(ViewBag.TeacherTotalNum - ViewBag.TeacherTotalNumOfBianNei)</span>人</div>
+                                                <div><span id="TeacherOfNotBianNeiRate"></span></div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            </div>
+                        </div>
+                    </div>
+                    <div class="inSec3Col6">
+                        <div class="inSec3Box">
+                            <div class="inSecT">
+                                <span>课程总览</span>
+                                <a href="#" class="more"><span></span><span></span><span></span></a>
+                            </div>
+                            <div class="inSec3Con">
+                                <div class="in3Sec3L">
+                                    <div class="in3Sec3LBox">
+                                        <img src="/Content/images/DragSSO/inSec6-14.png" alt="">
+                                        <div>
+                                            <div>课程建设总数</div>
+                                            <div class="in3Sec3LT">@ViewBag.LessonTotalNum</div>
+                                        </div>
+                                    </div>
+                                    <div class="in3Sec3LBox">
+                                        <img src="/Content/images/DragSSO/inSec6-13.png" alt="">
+                                        <div>
+                                            <div>本学期开课总数</div>
+                                            <div class="in3Sec3LT">@ViewBag.OpenLessonTotalNum</div>
+                                        </div>
+                                    </div>
+                                    <div class="in3Sec3LBox">
+                                        <img src="/Content/images/DragSSO/inSec6-12.png" alt="">
+                                        <div>
+                                            <div>课程运行预警</div>
+                                            <div class="in3Sec3LT">@ViewBag.OpenLessonTotalNum</div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="echartBox" id="class"></div>
+                                <div class="in3Sec3ClassTxt">课程分类</div>
+                                @*<div class="layui-input-block classSort">
+                                        <select id="" name="wh" lay-filter="wh" lay-verify="required">
+                                            <option value="0-20">0-20</option>
+                                            <option value="20-40">20-40</option>
+                                            <option value="40-60">40-60</option>
+                                            <option value="60-80">60-80</option>
+                                            <option value="80-100" selected>机械执照专业机械执照专业机械执照专业</option>
+                                        </select>
+                                    </div>*@
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <!--  / index_sec3  -->
+    <!-- login -->
+    <div class="logins">
+        <div class="loginZhe"></div>
+        <div class="loginBox">
+            <div class="login commonClear">
+                <div class="loginTab">
+                    <div class="active">
+                        <img class="loginTabImg1" src="/Content/images/DragSSO/login5-3.png" alt="" />
+                        <img class="loginTabImg2" src="/Content/images/DragSSO/login5-3s.png" alt="" />
+                    </div>
+                    <div>
+                        <img class="loginTabImg1" src="/Content/images/DragSSO/login5-2.png" alt="" />
+                        <img class="loginTabImg2" src="/Content/images/DragSSO/login5-2s.png" alt="" />
+                    </div>
+                </div>
+                <div class="loginCon">
+                    <form id="loginForm" role="form" action="/a/login" method="post" novalidate="novalidate">
+                        <div class="loginTitle">用户登录</div>
+                        <div class="loginInput">
+                            <div class="loginInputTxt">用户名</div>
+                            <input type="text" placeholder="用户名" id="username" name="username"
+                                   class="form-control required">
+                        </div>
+                        <div class="loginInput">
+                            <div class="loginInputTxt">用户名</div>
+                            <input type="password" placeholder="密码" id="password" name="password"
+                                   class="form-control required">
+                        </div>
+                        <div class="loginInput">
+                            <div class="loginInputTxt">验证码</div>
+                            <div class="codeBox">
+                                <input type="code" placeholder="验证码" id="code" name="code"
+                                       class="form-control required">
+                                <div class="variCode"><img src="/Content/images/DragSSO/verCode.png" alt="" /></div>
+                            </div>
+                        </div>
+                        <div class="loginBtn">
+                            <input type="submit" class="btn btn-white btn-outline btn-lg btn-rounded progress-login"
+                                   value="登录" style="cursor:pointer">
+                        </div>
+                        <div class="loginBtn loginBtn2">
+                            <input type="submit" class="btn btn-white btn-outline btn-lg btn-rounded progress-login"
+                                   value="教师注册" style="cursor:pointer">
+                        </div>
+                        <div class="wx">
+                            <img src="/Content/images/DragSSO/weixin.png" alt="">
+                            <span>微信登录</span>
+                        </div>
+                    </form>
+                    <div class="qrCodeBox">
+                        <div class="loginTitle">移动端登录</div>
+                        <div id="qrCode"></div>
+                    </div>
+                </div>
+                <div class="tips">
+                    <img src="/Content/images/DragSSO/tips1.png" alt=""> <span>建议使用360或谷歌浏览器</span>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- login -->
+</div>
+<!--  / warpper  -->
+
+
+<script src="/Content/js/DragSSO/index3.js"></script>
+<script src="/Content/js/DragSSO/aLeft.js"></script>
+<script>
+    //左侧-可用应用
+    var flowList = '@ViewBag.FlowList';
+                                        flowList = flowList.replace(/&quot;/g, "\"");
+    var flowListJson = JSON.parse(flowList);
+    $("#flowTypeList").find(".itemName").bind("click", function() {
+                                            var html = "";
+                                            var category = $(this).attr("itemName");
+        $('#flowTypeList').find('li.active').removeClass('active');
+        $(this).parent('li').addClass("active");
+        $.each(flowListJson,function(i, item) {
+                                                if (category == "全部") {
+                                                    html += "<li> <a href=\"/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&id="+item.F_Id+"&shcemeCode="+item.F_Code+"\" target=\"_blank\"> <img src=\"/Content/images/DragSSO/inSec1-"+Math.floor(Math.random()*21+2)+".png\" /><span>"+item.F_Name+"</span> </a> </li>";
+                                                }else if (item.F_Category==category) {
+                                                    html += "<li> <a href=\"/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&id=" + item.F_Id + "&shcemeCode=" + item.F_Code +"\" target=\"_blank\"> <img src=\"/Content/images/DragSSO/inSec1-"+Math.floor(Math.random()*21+2)+".png\" /><span>"+item.F_Name+"</span> </a> </li>";
+                                                }
+                                            });
+        $("#flowList").html(html);
+                                        })
+    $("#flowTypeList").find(".itemName").eq(0).trigger("click");
+    
+    //学生总览
+    var StuInfoOfManRate = parseInt((@ViewBag.StuInfoTotalNumOfMan) / (@ViewBag.StuInfoTotalNum) * 100);
+    //男比例
+    $("#StuInfoOfManRate").html(StuInfoOfManRate + "%");
+    //女比例
+    $("#StuInfoOfWomanRate").html((100 - StuInfoOfManRate) + "%");
+    //学生逃课预警
+    $("#StuInfoOfTaoKe").html(parseInt(@ViewBag.StuInfoTotalNum * 0.05));
+    //教师总览
+    var TeacherOfManRate = parseInt((@ViewBag.TeacherTotalNumOfMan) / (@ViewBag.TeacherTotalNum) * 100);
+    var TeacherOfBianNeiRate = parseInt((@ViewBag.TeacherTotalNumOfBianNei) / (@ViewBag.TeacherTotalNum) * 100);
+    //男比例
+    $("#TeacherOfManRate").html(TeacherOfManRate + "%");
+    //女比例
+    $("#TeacherOfWomanRate").html((100-TeacherOfManRate) + "%");
+    //在编教师
+    $("#TeacherOfBianNeiRate").html(TeacherOfBianNeiRate + "%");
+    //非在编教师
+    $("#TeacherOfNotBianNeiRate").html((100-TeacherOfBianNeiRate) + "%");
+
+
+
+
+</script>

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/_LayoutSSODrag.cshtml

@@ -0,0 +1,155 @@
+@using Learun.Util
+
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <meta name="renderer" content="webkit" />
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
+    <meta name="format-detection" content="telephone=no" />
+    <title>网上办事大厅拖拽版</title>
+    <meta name="keywords" content="网上办事大厅拖拽版" />
+    <meta name="description" content="网上办事大厅拖拽版" />
+    <link rel="stylesheet" type="text/css" href="/Content/font/css/font-awesome.css" />
+    <link rel="stylesheet" href="/Content/layui/css/layui.css" />
+    <link rel="stylesheet" type="text/css" href="/Content/css/DragSSO/common.css" />
+    <link rel="stylesheet" href="/Content/css/DragSSO/login5.css" />
+    <link rel="stylesheet" type="text/css" href="/Content/css/DragSSO/index.css" />
+    <!-- 蓝色背景 -->
+    <link rel="stylesheet" id="skinLink" type="text/css" href="/Content/css/DragSSO/blue.css" />
+    <!-- 红色背景 -->
+    <!-- <link rel="stylesheet" type="text/css" href="/Content/css/DragSSO/red.css"> -->
+    <!-- 绿色背景 -->
+    <!-- <link rel="stylesheet" id="skinLink" type="text/css" href="/Content/css/DragSSO/green.css"> -->
+    <!----自适应----->
+
+    <script src="/Content/js/jquery.min.js"></script>
+    <script type="text/javascript" src="/Content/js/qrcode.min.js"></script>
+    <script src="/Content/js/echarts.js"></script>
+    <script src="/Content/layui/layui.js" charset="utf-8"></script>
+    <script src="/Content/js/jquery-ui.min.js"></script>
+    <script src="/Content/js/DragSSO/main.js"></script>
+    <!----自适应----->
+
+</head>
+<body>
+    @{
+        var logininfo = LoginUserInfo.Get();
+        if (logininfo == null)
+        {
+            logininfo = new UserInfo();
+        }
+    }
+    <div class="header inSecShadow">
+        <a href="/SSOSystem/DragModelOne" class="headLogo">
+            网上办事大厅
+        </a>
+        <ul class="headTab">
+            <li><a href="/Home/Index" target="_blank"><img src="/Content/images/DragSSO/head1.png" alt="" /></a></li>
+        </ul>
+        <div class="headTitle">数字化智慧校园</div>
+        <div class="headSearch">
+            <input id="headSearchInput" type="text" placeholder="查找服务" />
+            <div class="headSearchImg"><img src="/Content/images/DragSSO/search.png" alt="" /></div>
+            <div class="headSearchHistory">
+                <div class="headSearchHistBox">历史 <i class="fa fa-angle-down"></i></div>
+            </div>
+            <div class="headSearchClose">关闭搜索</div>
+        </div>
+        <div class="headUser">
+            <div class="headMode">
+                <div class="headModeTxt"><span>办事大厅模式</span> <i class="fa fa-angle-down"></i> </div>
+                <ul class="headModeList">
+                    <li class="active"><a href="/SSOSystem/DragModelOne">办事大厅模式</a></li>
+                    <li><a href="/SSOSystem/DragModelTwo">效率优先模式</a></li>
+                    <li><a href="/SSOSystem/DragModelThree">管理驾驶舱模式</a></li>
+                </ul>
+            </div>
+            <div class="headLine1"></div>
+            <!-- 登录后 -->
+            <div class="loginAfter">
+                <div class="authorBox">
+                    <div class="headUserImg"><img src="/LR_OrganizationModule/User/GetImg?userId=@logininfo.userId " alt="" /></div>
+                    <div class="headUserTxt">@logininfo.realName</div>
+                    <div class="authorSetBox">
+                        <div class="authorSetCon inSecShadow">
+                            <div class="auSetLi signOut">退出</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="headLine1"></div>
+                <div class="headNumBox">
+                    <div class="headNum">工号 @logininfo.account</div>
+                    <div class="headNumTxt">@logininfo.departmentName <span></span> @logininfo.roleName</div>
+                </div>
+                <!-- 登录后 -->
+                <div class="headLine1"></div>
+                <div class="skinBox">
+                    <img src="/Content/images/DragSSO/head4.png" alt="" />
+                    <div class="skin inSecShadow">
+                        <div class="skinT">皮肤 <img src="/Content/images/DragSSO/close.png" alt="" /></div>
+                        <div class="skinList">
+                            <div skin="blue" class="skins blue active">
+                                <div>
+                                    <img src="/Content/images/DragSSO/skin1.jpg" alt="" />
+                                    <div class="skinTxt">蓝</div>
+                                    <div class="skinText">选用皮肤</div>
+                                    <div class="skinCheck">
+                                        <i class="fa fa-check-circle"></i>
+                                        <span>使用中</span>
+                                    </div>
+                                </div>
+                            </div>
+                            <div skin="red" class="skins red">
+                                <div>
+                                    <img src="/Content/images/DragSSO/skin3.jpg" alt="" />
+                                    <div class="skinTxt">红</div>
+                                    <div class="skinText">选用皮肤</div>
+                                    <div class="skinCheck">
+                                        <i class="fa fa-check-circle"></i>
+                                        <span>使用中</span>
+                                    </div>
+                                </div>
+                            </div>
+                            <div skin="green" class="skins green">
+                                <div>
+                                    <img src="/Content/images/DragSSO/skin2.jpg" alt="" />
+                                    <div class="skinTxt">绿</div>
+                                    <div class="skinText">选用皮肤</div>
+                                    <div class="skinCheck">
+                                        <i class="fa fa-check-circle"></i>
+                                        <span>使用中</span>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="headLine1"></div>
+                <div class="downloadFx">
+                    <img src="/Content/images/DragSSO/download.png" alt="" />
+                    <a href="/飞星客户端.exe"><span style="color:white;">飞星下载</span></a>
+                </div>
+
+            </div>
+        </div>
+    </div>
+    @RenderBody()
+    @Html.AppendJsFile(
+        "/Views/LR_Content/script/lr-base.js",
+        "/Views/LR_Content/script/lr-clientdata.js",
+        "/Views/LR_Content/script/lr-ajax.js"
+        )
+
+</body>
+
+</html>
+<script>
+    $(function () {
+
+
+
+    })
+</script>

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config

@@ -19,6 +19,8 @@
   <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <!--获取网上缴费数据-->
+  <add name="IsPay" connectionString="Server=192.168.53.19;Initial Catalog=u8gx;User ID=jfcx;Password=xcyz1234567." providerName="System.Data.SqlClient" />
 
   <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs

@@ -202,7 +202,7 @@ namespace Learun.Application.WebApi.Modules
             var entity = stuInfoFreshIBLL.GetStuInfoFreshEntity(model.ID);
             entity.StudentLoan = model.StudentLoan;
             entity.StudentLoanStatus = model.StudentLoanStatus;
-
+            entity.StudentLoanBLStatus = model.StudentLoanBLStatus;
             stuInfoFreshIBLL.SaveEntity(entity.ID, entity);
 
             return Success("保存成功");
@@ -382,7 +382,11 @@ namespace Learun.Application.WebApi.Modules
             /// <summary>
             /// 贷款回执码状态
             /// </summary>
-            public string StudentLoanStatus { get; set; }
+            public string StudentLoanStatus { get; set; }    
+            /// <summary>
+            /// 办理贷款状态
+            /// </summary>
+            public string StudentLoanBLStatus { get; set; }
             /// <summary>
             /// 家庭成员
             /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Module/ModuleEntity.cs

@@ -1,12 +1,13 @@
 using Learun.Util;
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Learun.Application.Base.SystemModule
 {
     /// <summary>
     /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
-    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// Copyright (c) 2013-2018 数字化校园 
     /// 创建人：陈彬彬
     /// 日 期：2017.03.04
     /// 描 述：功能模块
@@ -175,5 +176,23 @@ namespace Learun.Application.Base.SystemModule
             this.F_ModifyUserName = userInfo.realName;
         }
         #endregion
+        #region 扩展成员
+        /// <summary>
+        /// 第一个汉字的拼音首字母
+        /// </summary>
+        [NotMapped]
+        public string FirstLetter { get; set; }
+        /// <summary>
+        /// 父级名称
+        /// </summary>
+        [NotMapped]
+        public string ParentName { get; set; }
+        /// <summary>
+        /// 子级列表
+        /// </summary>
+        [NotMapped]
+        public List<ModuleEntity> ChildrenList { get; set; }
+
+        #endregion
     }
 }

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

@@ -0,0 +1,29 @@
+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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-18 09:54
+    /// 描 述：网上办事大厅拖拽版-卡片块排序管理
+    /// </summary>
+    public class SSO_Drag_CardSortManageMap : EntityTypeConfiguration<SSO_Drag_CardSortManageEntity>
+    {
+        public SSO_Drag_CardSortManageMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("SSO_DRAG_CARDSORTMANAGE");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

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

@@ -0,0 +1,29 @@
+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 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-18 09:47
+    /// 描 述：网上办事大厅拖拽版-桌面管理
+    /// </summary>
+    public class SSO_Drag_DesktopManageMap : EntityTypeConfiguration<SSO_Drag_DesktopManageEntity>
+    {
+        public SSO_Drag_DesktopManageMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("SSO_DRAG_DESKTOPMANAGE");
+            //主键
+            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

@@ -112,6 +112,8 @@
     <Compile Include="LR_CRM\CrmCustomerContactMap.cs" />
     <Compile Include="LR_CRM\CrmChanceMap.cs" />
     <Compile Include="LR_Desktop\MessageRemindMap.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_CardSortManageMap.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_DesktopManageMap.cs" />
     <Compile Include="LR_Desktop\WeChatDevelopMap.cs" />
     <Compile Include="LR_Excel\ExcelExportMap.cs" />
     <Compile Include="LR_Excel\ExcelImportFieldMap.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoBLL.cs

@@ -144,6 +144,28 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+        /// <summary>
+        /// 教师年龄比例
+        /// </summary>
+        /// <returns></returns>
+        public EmpInfoEntity GetEmpInfoAgeRate()
+        {
+            try
+            {
+                return empInfoService.GetEmpInfoAgeRate();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs

@@ -663,6 +663,26 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 获取证书日期
         /// </summary>
         [NotMapped] public string CertificateDates { get; set; }
+        /// <summary>
+        /// 60岁以上
+        /// </summary>
+        [NotMapped] public int age1 { get; set; }
+        /// <summary>
+        /// 50~60岁
+        /// </summary>
+        [NotMapped] public int age2 { get; set; }
+        /// <summary>
+        /// 40~50岁
+        /// </summary>
+        [NotMapped] public int age3 { get; set; }
+        /// <summary>
+        /// 30~40岁
+        /// </summary>
+        [NotMapped] public int age4 { get; set; }
+        /// <summary>
+        /// 20~30岁
+        /// </summary>
+        [NotMapped] public int age5 { get; set; }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoIBLL.cs

@@ -38,6 +38,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns> 
         IEnumerable<EmpInfoEntity> GetList(string queryJson);
         IEnumerable<EmpInfoEntity> GetEmpInfoEntitiesByName(string name);
+
+        /// <summary>
+        /// 教师年龄比例
+        /// </summary>
+        /// <returns></returns>
+        EmpInfoEntity GetEmpInfoAgeRate();
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs

@@ -349,7 +349,36 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
-
+        /// <summary>
+        /// 教师年龄比例
+        /// </summary>
+        /// <returns></returns>
+        public EmpInfoEntity GetEmpInfoAgeRate()
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append(@"select 
+sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 60 then 1 else 0 end) as age1,
+sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 50 and DATEDIFF(YYYY, t.Birthday, GETDATE()) <= 60 then 1 else 0 end) as age2,
+sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 40 and DATEDIFF(YYYY, t.Birthday, GETDATE()) <= 50 then 1 else 0 end) as age3,
+sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 30 and DATEDIFF(YYYY, t.Birthday, GETDATE()) <= 40 then 1 else 0 end) as age4,
+sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Birthday, GETDATE()) <= 30 then 1 else 0 end) as age5
+ from empinfo t where t.Birthday is not null");
+                return this.BaseRepository("CollegeMIS").FindEntity<EmpInfoEntity>(strSql.ToString(), null);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoBLL.cs

@@ -7,7 +7,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 {
     /// <summary>
     /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
-    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// Copyright (c) 2013-2018 数字化校园 
     /// 创 建：超级管理员
     /// 日 期：2019-01-24 17:03
     /// 描 述：课程信息管理
@@ -212,6 +212,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+        public IEnumerable<LessonInfoEntity> GetAllList()
+        {
+            try
+            {
+                return lessonInfoService.GetAllList();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoIBLL.cs

@@ -6,7 +6,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 {
     /// <summary>
     /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
-    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// Copyright (c) 2013-2018 数字化校园 
     /// 创 建：超级管理员
     /// 日 期：2019-01-24 17:03
     /// 描 述：课程信息管理
@@ -54,6 +54,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         void SaveEntity(string keyValue, LessonInfoEntity entity);
         IEnumerable<LessonInfoEntity> GetAllLesson();
+        IEnumerable<LessonInfoEntity> GetAllList();
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs

@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 {
     /// <summary>
     /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
-    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// Copyright (c) 2013-2018 数字化校园 
     /// 创 建：超级管理员
     /// 日 期：2019-01-24 17:03
     /// 描 述：课程信息管理
@@ -314,6 +314,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+        public IEnumerable<LessonInfoEntity> GetAllList()
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindList<LessonInfoEntity>();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_SendMessage/SYS_SendMessageBLL.cs

@@ -7,7 +7,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 {
     /// <summary>
     /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
-    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// Copyright (c) 2013-2018 数字化校园 
     /// 创 建：超级管理员
     /// 日 期：2019-02-27 11:51
     /// 描 述：内部邮件收件箱
@@ -42,6 +42,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<SYS_SendMessageEntity> GetList2(string queryJson)
+        {
+            try
+            {
+                return sYS_SendMessageService.GetList2(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         public IEnumerable<SYS_SendMessageEntity> GetList()
         {
             try

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_SendMessage/SYS_SendMessageIBLL.cs

@@ -6,7 +6,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 {
     /// <summary>
     /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
-    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// Copyright (c) 2013-2018 数字化校园 
     /// 创 建：超级管理员
     /// 日 期：2019-02-27 11:51
     /// 描 述：内部邮件收件箱
@@ -21,6 +21,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
         IEnumerable<SYS_SendMessageEntity> GetPageList(Pagination pagination, string queryJson);
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<SYS_SendMessageEntity> GetList2(string queryJson);
         /// <summary>
         /// 获取SYS_SendMessage表实体数据
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_SendMessage/SYS_SendMessageService.cs

@@ -18,7 +18,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 {
     /// <summary>
     /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
-    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// Copyright (c) 2013-2018 数字化校园 
     /// 创 建：超级管理员
     /// 日 期：2019-02-27 11:51
     /// 描 述：内部邮件收件箱
@@ -89,6 +89,52 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<SYS_SendMessageEntity> GetList2(string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.MESSAGEID,
+                t.SENDER,
+                t.RECEIVERToo,
+                t.RECEIVERS,
+                t.RECEIVER,
+                t.TITLE,
+                t.URL,
+                t.SENDTIME,t.SendFLAG,t.SENDERID
+                ");
+                strSql.Append("  FROM SYS_SendMessage t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["userId"].IsEmpty())
+                {
+                    dp.Add("userId", "" + queryParam["userId"].ToString() + "", DbType.String);
+                    strSql.Append(" AND t.SENDERID=@userId ");
+                }
+                return this.BaseRepository().FindList<SYS_SendMessageEntity>(strSql.ToString(), dp);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 获取SYS_SendMessage表实体数据
         /// <param name="keyValue">主键</param>
@@ -296,7 +342,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                 string access_token = weixintokenobj.access_token;
                                 string jsondata = "{\"touser\":\"" + userinfo.OpenIdForWeixin + "\"," +
                                 "\"template_id\":\"" + weixintasktempid + "\"," +
-                                "\"url\":\"" + weixintaskurl + "\"," +
+                                "\"url\":\"" + weixintaskurl + "/#/?page=mail\"," +
                                 "\"data\":{" +
                                 "\"first\": {\"value\":\"您有新的未读邮件\",\"color\":\"#173177\"}," +
                                 "\"keyword1\":{\"value\":\"未读邮件\",\"color\":\"#173177\"}," +
@@ -313,6 +359,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 站内消息提醒
+        /// </summary>
+        /// <param name="needpostuserlist"></param>
+        /// <param name="title"></param>
+        public void PushMessageRemind(List<UserEntity> needpostuserlist, SYS_SendMessageEntity model)
+        {
+            foreach (UserEntity userinfo in needpostuserlist)
+            {
+                MessageRemindEntity entity = new MessageRemindEntity();
+                entity.ReceiptId = userinfo.F_UserId;
+                entity.ReceiptName = userinfo.F_RealName;
+                entity.SenderId = model.SENDERID;
+                entity.SenderName = model.SENDER;
+                entity.TheTitle = "内部邮件";
+                entity.TheContent = model.TITLE + ":" + model.CONTENTS;
+                entity.InstanceId = model.MESSAGEID;
+                entity.ConnectionUrl = "/EducationalAdministration/SYS_SendMessage/FormView?keyValue=";
+                entity.SendTime = DateTime.Now;
+                entity.ReadSigns = false;
+                this.BaseRepository().Insert(entity);
+            }
+        }
+
         public IEnumerable<SYS_SendMessageEntity> GetList()
         {
             try

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionBLL.cs

@@ -7,7 +7,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 {
     /// <summary>
     /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
-    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// Copyright (c) 2013-2018 数字化校园 
     /// 创 建：超级管理员
     /// 日 期：2020-01-17 15:31
     /// 描 述：学生消费记录
@@ -91,6 +91,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuConsumptionEntity> GetListByAccount(string account)
+        {
+            try
+            {
+                return stuConsumptionService.GetListByAccount(account);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionIBLL.cs

@@ -6,7 +6,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 {
     /// <summary>
     /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
-    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// Copyright (c) 2013-2018 数字化校园 
     /// 创 建：超级管理员
     /// 日 期：2020-01-17 15:31
     /// 描 述：学生消费记录
@@ -34,6 +34,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <summary>
         /// <returns></returns>
         StuConsumptionEntity GetStuConsumptionEntity(string keyValue);
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<StuConsumptionEntity> GetListByAccount(string account);
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionService.cs

@@ -10,7 +10,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 {
     /// <summary>
     /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
-    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// Copyright (c) 2013-2018 数字化校园 
     /// 创 建：超级管理员
     /// 日 期：2020-01-17 15:31
     /// 描 述：学生消费记录
@@ -96,7 +96,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("CARDSN", "%" + queryParam["CARDSN"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.CARDSN Like @CARDSN ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<StuConsumptionEntity>(strSql.ToString(),dp, pagination);
+                return this.BaseRepository("CollegeMIS").FindList<StuConsumptionEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -172,7 +172,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("CARDSN", "%" + queryParam["CARDSN"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.CARDSN Like @CARDSN ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<StuConsumptionEntity>(strSql.ToString(),dp);
+                return this.BaseRepository("CollegeMIS").FindList<StuConsumptionEntity>(strSql.ToString(), dp);
             }
             catch (Exception ex)
             {
@@ -211,6 +211,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuConsumptionEntity> GetListByAccount(string account)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindList<StuConsumptionEntity>(x => x.OUTID == account);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region  提交数据
@@ -224,7 +248,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<StuConsumptionEntity>(t=>t.SID == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<StuConsumptionEntity>(t => t.SID == keyValue);
             }
             catch (Exception ex)
             {
@@ -244,13 +268,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <summary>
         /// <returns></returns>
-        public void SaveEntity( UserInfo userInfo, string keyValue, StuConsumptionEntity entity)
+        public void SaveEntity(UserInfo userInfo, string keyValue, StuConsumptionEntity entity)
         {
             try
             {
                 if (!string.IsNullOrEmpty(keyValue))
                 {
-                    entity.Modify(keyValue,userInfo);
+                    entity.Modify(keyValue, userInfo);
                     this.BaseRepository("CollegeMIS").Update(entity);
                 }
                 else

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

@@ -315,6 +315,44 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        public void SyncDept()
+        {
+            try
+            {
+                stuInfoBasicService.SyncDept();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        public void SyncMajor()
+        {
+            try
+            {
+                stuInfoBasicService.SyncMajor();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         public void UpdateAccount()
         {
             try

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

@@ -76,5 +76,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         bool GetAny();
         IEnumerable<StuInfoBasicEntity> GetAllList();
         IEnumerable<StuInfoBasicEntity> GetStuInfoByClassNo(string classNo);
+        void SyncDept();
+        void SyncMajor();
     }
 }

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

@@ -885,5 +885,57 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+        public void SyncDept()
+        {
+            try
+            {
+                var data = this.BaseRepository("CollegeMIS").FindList<StuInfoBasicEntity>().ToList();
+                var majorList = this.BaseRepository("CollegeMIS").FindList<CdMajorEntity>().ToList();
+                foreach (var item in data)
+                {
+                    var deptNo = majorList.FirstOrDefault(a => a.MajorNo == item.MajorNo)?.DeptNo;
+                    item.DeptNo = deptNo;
+                    this.BaseRepository("CollegeMIS").Update(item);
+
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        public void SyncMajor()
+        {
+            try
+            {
+                var data = this.BaseRepository("CollegeMIS").FindList<StuInfoBasicEntity>().ToList();
+                var classList = this.BaseRepository("CollegeMIS").FindList<ClassInfoEntity>().ToList();
+                foreach (var item in data)
+                {
+                    var majorNo = classList.FirstOrDefault(a => a.ClassNo == item.ClassNo)?.MajorNo;
+                    item.MajorNo = majorNo;
+                    this.BaseRepository("CollegeMIS").Update(item);
+
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs

@@ -19,6 +19,31 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
         #region  获取数据
 
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        public void SynchronousList()
+        {
+            try
+            {
+                stuInfoFreshService.SynchronousList();
+            }
+            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/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs

@@ -507,6 +507,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("STUDENTLOAN")]
         public string StudentLoan { get; set; }
         /// <summary> 
+        /// 助学贷款：办理贷款状态
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("STUDENTLOANBLSTATUS")]
+        public string StudentLoanBLStatus { get; set; }
+        /// <summary> 
         /// 助学贷款状态：1已审核0未审核
         /// </summary> 
         /// <returns></returns> 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs

@@ -16,6 +16,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
     {
         #region  获取数据
 
+        /// <summary>
+        /// 获取数据列表
+        /// </summary>
+        /// <param name="StuNo">学号</param>
+        /// <returns></returns>
+        void SynchronousList();
+
         /// <summary>
         /// 获取列表数据
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs

@@ -112,6 +112,59 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
         #region  获取数据
 
+        /// <summary>
+        /// 获取列表数据
+        /// <summary>
+        /// <returns></returns>
+        public void SynchronousList()
+        {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                List<StuInfoFreshEntity> ListStuInfo = new List<StuInfoFreshEntity>();
+                List<StuInfoFreshEntity> Model = this.BaseRepository("CollegeMIS").FindList<StuInfoFreshEntity>().ToList();
+                if (Model != null)
+                {
+
+                    for (int i = 0; i < Model.Count(); i++)
+                    {
+                        //var IspayList = this.BaseRepository("IsPay").ExecuteBySql($" select * from View_JFdd WHERE XH ='{Model[i].StuNo}' ").ToString().ToList();
+                        //if (IspayList.Count > 0)
+                        //{
+                        //    Model[i].PayFeeStatus = "1";
+                        //    ListStuInfo.Add(Model[i]);
+                        //}
+                        var IspayList = this.BaseRepository("IsPay").FindTable($" select * from View_JFdd WHERE XH ='{Model[i].StuNo}' ");
+                        if (IspayList.Rows.Count > 0)
+                        {
+                            Model[i].PayFeeStatus = "1";
+                            ListStuInfo.Add(Model[i]);
+                        }
+                        else
+                        {
+                            Model[i].PayFeeStatus = "0";
+                            ListStuInfo.Add(Model[i]);
+                        }
+                    }
+                    this.BaseRepository("CollegeMIS").Update(ListStuInfo);
+                }
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+
         /// <summary>
         /// 获取列表数据
         /// <summary>
@@ -160,7 +213,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
 
                 var data = this.BaseRepository("CollegeMIS").FindList<StuInfoFreshEntity>(strSql.ToString(), dp);
-                
+
                 return data;
             }
             catch (Exception ex)
@@ -861,7 +914,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     entity.Modify(keyValue);
                     db.Update(entity);
                     db.Delete<StuInfoFreshEmergePeopleEntity>(t => t.StuInfoFreshId == stuInfoFreshEntityTmp.ID);
-                    
+
                     if (null != stuInfoFreshEmergePeopleList && null != stuInfoFreshFamilyList)
                     {
                         foreach (StuInfoFreshEmergePeopleEntity item in stuInfoFreshEmergePeopleList)
@@ -1148,13 +1201,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                if (status == "1")//通过
+                //if (status == "1")//通过
+                //{
+                //    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanStatus='1' where ID='" + keyValue + "' ");
+                //}
+                //else
+                //{
+                //    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanStatus='0' where ID='" + keyValue + "' ");
+                //}
+                if (status == "1")//已办理
                 {
-                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanStatus='1' where ID='" + keyValue + "' ");
+                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanBLStatus='1' where ID='" + keyValue + "' ");
                 }
                 else
                 {
-                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanStatus='0' where ID='" + keyValue + "' ");
+                    this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanBLStatus='2' where ID='" + keyValue + "' ");
                 }
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageBLL.cs

@@ -0,0 +1,169 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.LR_Desktop
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-18 09:54
+    /// 描 述：网上办事大厅拖拽版-卡片块排序管理
+    /// </summary>
+    public class SSO_Drag_CardSortManageBLL : SSO_Drag_CardSortManageIBLL
+    {
+        private SSO_Drag_CardSortManageService sSO_Drag_CardSortManageService = new SSO_Drag_CardSortManageService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<SSO_Drag_CardSortManageEntity> GetList( string queryJson )
+        {
+            try
+            {
+                return sSO_Drag_CardSortManageService.GetList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<SSO_Drag_CardSortManageEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return sSO_Drag_CardSortManageService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public SSO_Drag_CardSortManageEntity GetEntity(string keyValue)
+        {
+            try
+            {
+                return sSO_Drag_CardSortManageService.GetEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                sSO_Drag_CardSortManageService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        public void SaveEntity(string keyValue, SSO_Drag_CardSortManageEntity entity)
+        {
+            try
+            {
+                sSO_Drag_CardSortManageService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存卡片块排序
+        /// </summary>
+        public void SaveCardSort(string userId, string modelCode, string desktopId, string cardSort)
+        {
+            try
+            {
+                sSO_Drag_CardSortManageService.SaveCardSort(userId, modelCode, desktopId, cardSort);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageEntity.cs

@@ -0,0 +1,68 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+namespace Learun.Application.TwoDevelopment.LR_Desktop
+
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-18 09:54
+    /// 描 述：网上办事大厅拖拽版-卡片块排序管理
+    /// </summary>
+    public class SSO_Drag_CardSortManageEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// 主键
+        /// </summary>
+        /// <returns></returns>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 用户
+        /// </summary>
+        /// <returns></returns>
+        [Column("USERID")]
+        public string UserId { get; set; }
+        /// <summary>
+        /// 模式编号：0办事大厅模式，1效率优先模式，2管理驾驶舱模式
+        /// </summary>
+        /// <returns></returns>
+        [Column("MODELCODE")]
+        public string ModelCode { get; set; }
+        /// <summary>
+        /// 桌面Id
+        /// </summary>
+        /// <returns></returns>
+        [Column("DESKTOPID")]
+        public string DesktopId { get; set; }
+        /// <summary>
+        /// 卡片块排序
+        /// </summary>
+        /// <returns></returns>
+        [Column("CARDSORT")]
+        public string CardSort { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.Id = Guid.NewGuid().ToString();
+        }
+        /// <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/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageIBLL.cs

@@ -0,0 +1,60 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.LR_Desktop
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-18 09:54
+    /// 描 述：网上办事大厅拖拽版-卡片块排序管理
+    /// </summary>
+    public interface SSO_Drag_CardSortManageIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<SSO_Drag_CardSortManageEntity> GetList(string queryJson);
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<SSO_Drag_CardSortManageEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        SSO_Drag_CardSortManageEntity GetEntity(string keyValue);
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        void SaveEntity(string keyValue, SSO_Drag_CardSortManageEntity entity);
+
+        /// <summary>
+        /// 保存卡片块排序
+        /// </summary>
+        void SaveCardSort(string userId, string modelCode, string desktopId, string cardSort);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageService.cs

@@ -0,0 +1,216 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.LR_Desktop
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-18 09:54
+    /// 描 述：网上办事大厅拖拽版-卡片块排序管理
+    /// </summary>
+    public class SSO_Drag_CardSortManageService : RepositoryFactory
+    {
+        #region 构造函数和属性
+
+        private string fieldSql;
+        /// <summary>
+        /// 构造方法
+        /// </summary>
+        public SSO_Drag_CardSortManageService()
+        {
+            fieldSql = @"
+                t.Id,
+                t.UserId,
+                t.ModelCode,
+                t.DesktopId,
+                t.CardSort
+            ";
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">条件参数</param>
+        /// <returns></returns>
+        public IEnumerable<SSO_Drag_CardSortManageEntity> GetList(string queryJson)
+        {
+            try
+            {
+                //参考写法
+                //var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                //var dp = new DynamicParameters(new { });
+                //dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(fieldSql);
+                strSql.Append(" FROM SSO_Drag_CardSortManage t ");
+                return this.BaseRepository().FindList<SSO_Drag_CardSortManageEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">条件参数</param>
+        /// <returns></returns>
+        public IEnumerable<SSO_Drag_CardSortManageEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(fieldSql);
+                strSql.Append(" FROM SSO_Drag_CardSortManage t ");
+                return this.BaseRepository().FindList<SSO_Drag_CardSortManageEntity>(strSql.ToString(), pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public SSO_Drag_CardSortManageEntity GetEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository().FindEntity<SSO_Drag_CardSortManageEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository().Delete<SSO_Drag_CardSortManageEntity>(t => t.Id == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// </summary>
+        public void SaveEntity(string keyValue, SSO_Drag_CardSortManageEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository().Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository().Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存卡片块排序
+        /// </summary>
+        public void SaveCardSort(string userId, string modelCode, string desktopId, string cardSort)
+        {
+            try
+            {
+                var model = this.BaseRepository().FindEntity<SSO_Drag_CardSortManageEntity>(x => x.UserId == userId && x.ModelCode == modelCode && x.DesktopId == desktopId);
+                if (model != null)
+                {
+                    model.CardSort = cardSort;
+                    this.BaseRepository().Update(model);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_DesktopManage/SSO_Drag_DesktopManageBLL.cs

@@ -0,0 +1,261 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.LR_Desktop
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-18 09:47
+    /// 描 述：网上办事大厅拖拽版-桌面管理
+    /// </summary>
+    public class SSO_Drag_DesktopManageBLL : SSO_Drag_DesktopManageIBLL
+    {
+        private SSO_Drag_DesktopManageService sSO_Drag_DesktopManageService = new SSO_Drag_DesktopManageService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<SSO_Drag_DesktopManageEntity> GetList( string queryJson )
+        {
+            try
+            {
+                return sSO_Drag_DesktopManageService.GetList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<SSO_Drag_DesktopManageEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return sSO_Drag_DesktopManageService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public SSO_Drag_DesktopManageEntity GetEntity(string keyValue)
+        {
+            try
+            {
+                return sSO_Drag_DesktopManageService.GetEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">条件参数</param>
+        /// <returns></returns>
+        public IEnumerable<SSO_Drag_DesktopManageEntity> GetListByModelCode(string userId, string modelCode)
+        {
+            try
+            {
+                return sSO_Drag_DesktopManageService.GetListByModelCode(userId, modelCode);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取实体数据
+        /// </summary>
+        /// <returns></returns>
+        public SSO_Drag_DesktopManageEntity GetEntityByDesktopCode(string userId, string modelCode, string desktopCode)
+        {
+            try
+            {
+                return sSO_Drag_DesktopManageService.GetEntityByDesktopCode(userId, modelCode, desktopCode);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                sSO_Drag_DesktopManageService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        public void SaveEntity(string keyValue, SSO_Drag_DesktopManageEntity entity)
+        {
+            try
+            {
+                sSO_Drag_DesktopManageService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// 桌面管理表、卡片块排序管理表增加默认数据
+        /// <param name="userId">用户ID</param>
+        /// <param name="modelCode">模式编号</param>
+        /// </summary>
+        public void AddDefaultData(string userId, string modelCode)
+        {
+            try
+            {
+                sSO_Drag_DesktopManageService.AddDefaultData(userId, modelCode);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 新建桌面
+        /// </summary>
+        public void AddDesktop(string userId, string modelCode, string desktopName, string desktopCode)
+        {
+            try
+            {
+                sSO_Drag_DesktopManageService.AddDesktop(userId, modelCode, desktopName, desktopCode);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 默认桌面恢复默认设置
+        /// </summary>
+        public void RestoreDefaultDesktop(string desktopId)
+        {
+            try
+            {
+                sSO_Drag_DesktopManageService.RestoreDefaultDesktop(desktopId); 
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_DesktopManage/SSO_Drag_DesktopManageEntity.cs

@@ -0,0 +1,99 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+namespace Learun.Application.TwoDevelopment.LR_Desktop
+
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-18 09:47
+    /// 描 述：网上办事大厅拖拽版-桌面管理
+    /// </summary>
+    public class SSO_Drag_DesktopManageEntity
+    {
+        #region 实体成员
+        /// <summary>
+        /// 主键
+        /// </summary>
+        /// <returns></returns>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 用户
+        /// </summary>
+        /// <returns></returns>
+        [Column("USERID")]
+        public string UserId { get; set; }
+        /// <summary>
+        /// 模式编号：one办事大厅模式，two效率优先模式，three管理驾驶舱模式
+        /// </summary>
+        /// <returns></returns>
+        [Column("MODELCODE")]
+        public string ModelCode { get; set; }
+        /// <summary>
+        /// 桌面名称
+        /// </summary>
+        /// <returns></returns>
+        [Column("DESKTOPNAME")]
+        public string DesktopName { get; set; }
+        /// <summary>
+        /// 桌面编号
+        /// </summary>
+        /// <returns></returns>
+        [Column("DESKTOPCODE")]
+        public string DesktopCode { get; set; }
+        /// <summary>
+        /// 排序号
+        /// </summary>
+        /// <returns></returns>
+        [Column("SORT")]
+        public string Sort { get; set; }
+        /// <summary>
+        /// 默认标识：1为默认桌面，0为自建桌面
+        /// </summary>
+        /// <returns></returns>
+        [Column("DEFAULTFLAG")]
+        public string DefaultFlag { get; set; }
+        /// <summary>
+        /// 默认名称
+        /// </summary>
+        /// <returns></returns>
+        [Column("DEFAULTNAME")]
+        public string DefaultName { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        /// <returns></returns>
+        [Column("CREATEDATE")]
+        public DateTime? CreateDate { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.Id = Guid.NewGuid().ToString();
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.Id = keyValue;
+        }
+        #endregion
+        #region 扩展数据
+        /// <summary>
+        /// 卡片块排序
+        /// </summary>
+        [NotMapped]
+        public string CardSort { get; set; }
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_DesktopManage/SSO_Drag_DesktopManageIBLL.cs

@@ -0,0 +1,85 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.LR_Desktop
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-18 09:47
+    /// 描 述：网上办事大厅拖拽版-桌面管理
+    /// </summary>
+    public interface SSO_Drag_DesktopManageIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<SSO_Drag_DesktopManageEntity> GetList(string queryJson);
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<SSO_Drag_DesktopManageEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        SSO_Drag_DesktopManageEntity GetEntity(string keyValue);
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">条件参数</param>
+        /// <returns></returns>
+        IEnumerable<SSO_Drag_DesktopManageEntity> GetListByModelCode(string userId, string modelCode);
+
+        /// <summary>
+        /// 获取实体数据
+        /// </summary>
+        /// <returns></returns>
+        SSO_Drag_DesktopManageEntity GetEntityByDesktopCode(string userId, string modelCode, string desktopCode);
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        void SaveEntity(string keyValue, SSO_Drag_DesktopManageEntity entity);
+
+
+        /// <summary>
+        /// 桌面管理表、卡片块排序管理表增加默认数据
+        /// <param name="userId">用户ID</param>
+        /// <param name="modelCode">模式编号</param>
+        /// </summary>
+        void AddDefaultData(string userId, string modelCode);
+
+        /// <summary>
+        /// 新建桌面
+        /// </summary>
+        void AddDesktop(string userId, string modelCode, string desktopName, string desktopCode);
+
+        /// <summary>
+        /// 默认桌面恢复默认设置
+        /// </summary>
+        void RestoreDefaultDesktop(string desktopId);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_DesktopManage/SSO_Drag_DesktopManageService.cs

@@ -0,0 +1,426 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.LR_Desktop
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-18 09:47
+    /// 描 述：网上办事大厅拖拽版-桌面管理
+    /// </summary>
+    public class SSO_Drag_DesktopManageService : RepositoryFactory
+    {
+        #region 构造函数和属性
+
+        private string fieldSql;
+        /// <summary>
+        /// 构造方法
+        /// </summary>
+        public SSO_Drag_DesktopManageService()
+        {
+            fieldSql = @"
+                t.Id,
+                t.UserId,
+                t.ModelCode,
+                t.DesktopName,
+                t.DesktopCode,
+                t.Sort
+            ";
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">条件参数</param>
+        /// <returns></returns>
+        public IEnumerable<SSO_Drag_DesktopManageEntity> GetList(string queryJson)
+        {
+            try
+            {
+                //参考写法
+                //var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                //var dp = new DynamicParameters(new { });
+                //dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.*,c.CardSort ");
+                strSql.Append(" FROM SSO_Drag_DesktopManage t left join SSO_Drag_CardSortManage c on t.Id=c.DesktopId ");
+                return this.BaseRepository().FindList<SSO_Drag_DesktopManageEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">条件参数</param>
+        /// <returns></returns>
+        public IEnumerable<SSO_Drag_DesktopManageEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(fieldSql);
+                strSql.Append(" FROM SSO_Drag_DesktopManage t ");
+                return this.BaseRepository().FindList<SSO_Drag_DesktopManageEntity>(strSql.ToString(), pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public SSO_Drag_DesktopManageEntity GetEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository().FindEntity<SSO_Drag_DesktopManageEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">条件参数</param>
+        /// <returns></returns>
+        public IEnumerable<SSO_Drag_DesktopManageEntity> GetListByModelCode(string userId, string modelCode)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.*,c.CardSort ");
+                strSql.Append(" FROM SSO_Drag_DesktopManage t left join SSO_Drag_CardSortManage c on t.Id=c.DesktopId ");
+                strSql.Append(" where t.UserId='" + userId + "' and t.ModelCode='" + modelCode + "'  ");
+                return this.BaseRepository().FindList<SSO_Drag_DesktopManageEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取实体数据
+        /// </summary>
+        /// <returns></returns>
+        public SSO_Drag_DesktopManageEntity GetEntityByDesktopCode(string userId, string modelCode, string desktopCode)
+        {
+            try
+            {
+                return this.BaseRepository().FindEntity<SSO_Drag_DesktopManageEntity>(x => x.UserId == userId && x.ModelCode == modelCode && x.DesktopCode == desktopCode);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            var db = this.BaseRepository().BeginTrans();
+            try
+            {
+                //this.BaseRepository().Delete<SSO_Drag_DesktopManageEntity>(t => t.Id == keyValue);
+                //删除卡片块排序
+                db.Delete<SSO_Drag_CardSortManageEntity>(x => x.DesktopId == keyValue);
+                //删除桌面
+                db.Delete<SSO_Drag_DesktopManageEntity>(x => x.Id == keyValue);
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// </summary>
+        public void SaveEntity(string keyValue, SSO_Drag_DesktopManageEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository().Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository().Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// 桌面管理表、卡片块排序管理表增加默认数据
+        /// <param name="userId">用户ID</param>
+        /// <param name="modelCode">模式编号</param>
+        /// </summary>
+        public void AddDefaultData(string userId, string modelCode)
+        {
+            var db = this.BaseRepository().BeginTrans();
+            try
+            {
+                var now = DateTime.Now;
+                //判断用户是否存在默认数据：不存在则增加；
+                var desktopEntity = db.FindEntity<SSO_Drag_DesktopManageEntity>(x => x.UserId == userId && x.ModelCode == modelCode && x.DesktopCode == "teacherDesktop");
+                if (desktopEntity == null)
+                {
+                    //默认数据为：教师桌面（模式一卡片块排序为：card1,card2,card3,card4,card5,card6,card7,card8,card9,card10,card11,card12,card13；模式二的卡片块排序为：card2,card3,card4,card5,card6,card7,card8,card9,card10,card11,card12,card13）、OA办公桌面（）、
+                    var cardSortInOne = "card1,card2,card3,card4,card5,card6,card7,card8,card9,card10,card11,card12,card13";
+                    var cardSortInTwo = "card2,card3,card4,card5,card6,card7,card8,card9,card10,card11,card12,card13";
+                    var desktopModel1 = new SSO_Drag_DesktopManageEntity()
+                    {
+                        UserId = userId,
+                        ModelCode = modelCode,
+                        DesktopName = "教师桌面",
+                        DesktopCode = "teacherDesktop",
+                        Sort = "0",
+                        DefaultFlag = "1",
+                        DefaultName = "教师桌面",
+                        CreateDate = now
+                    };
+                    desktopModel1.Create();
+                    db.Insert(desktopModel1);
+                    var desktopModel2 = new SSO_Drag_DesktopManageEntity()
+                    {
+                        UserId = userId,
+                        ModelCode = modelCode,
+                        DesktopName = "OA办公桌面",
+                        DesktopCode = "workDesktop",
+                        Sort = "1",
+                        DefaultFlag = "1",
+                        DefaultName = "OA办公桌面",
+                        CreateDate = now
+                    };
+                    desktopModel2.Create();
+                    db.Insert(desktopModel2);
+                    var cardSortModel1 = new SSO_Drag_CardSortManageEntity()
+                    {
+                        UserId = userId,
+                        ModelCode = modelCode,
+                        DesktopId = desktopModel1.Id,
+                        CardSort = modelCode == "one" ? cardSortInOne : cardSortInTwo
+                    };
+                    cardSortModel1.Create();
+                    db.Insert(cardSortModel1);
+                    var cardSortModel2 = new SSO_Drag_CardSortManageEntity()
+                    {
+                        UserId = userId,
+                        ModelCode = modelCode,
+                        DesktopId = desktopModel2.Id,
+                        CardSort = ""
+                    };
+                    cardSortModel2.Create();
+                    db.Insert(cardSortModel2);
+
+                }
+
+
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// 新建桌面
+        /// </summary>
+        public void AddDesktop(string userId, string modelCode, string desktopName, string desktopCode)
+        {
+            var db = this.BaseRepository().BeginTrans();
+            try
+            {
+                //增加桌面数据
+                var desktopModel = new SSO_Drag_DesktopManageEntity()
+                {
+                    UserId = userId,
+                    ModelCode = modelCode,
+                    DesktopName = desktopName,
+                    DesktopCode = desktopCode,
+                    Sort = "2",
+                    DefaultFlag = "0",
+                    CreateDate = DateTime.Now
+                };
+                desktopModel.Create();
+                db.Insert(desktopModel);
+                //增加卡片块排序数据
+                var cardModel = new SSO_Drag_CardSortManageEntity()
+                {
+                    UserId = userId,
+                    ModelCode = modelCode,
+                    DesktopId = desktopModel.Id,
+                    CardSort = ""
+                };
+                cardModel.Create();
+                db.Insert(cardModel);
+
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 默认桌面恢复默认设置
+        /// </summary>
+        public void RestoreDefaultDesktop(string desktopId)
+        {
+            var db = this.BaseRepository().BeginTrans();
+            try
+            {
+                //桌面
+                var desktopEntity = db.FindEntity<SSO_Drag_DesktopManageEntity>(x => x.Id == desktopId);
+                if (desktopEntity != null && desktopEntity.DefaultFlag == "1")
+                {
+                    desktopEntity.DesktopName = desktopEntity.DefaultName;
+                    db.Update(desktopEntity);
+                    //卡片块排序
+                    var cardEntity = db.FindEntity<SSO_Drag_CardSortManageEntity>(x => x.DesktopId == desktopEntity.Id);
+                    if (cardEntity != null)
+                    {
+                        if (desktopEntity.DesktopCode == "teacherDesktop")
+                        {
+                            var cardSortInOne = "card1,card2,card3,card4,card5,card6,card7,card8,card9,card10,card11,card12,card13";
+                            var cardSortInTwo = "card2,card3,card4,card5,card6,card7,card8,card9,card10,card11,card12,card13";
+
+                            cardEntity.CardSort = desktopEntity.ModelCode == "one" ? cardSortInOne : cardSortInTwo;
+                        }
+                        else
+                        {
+                            cardEntity.CardSort = "";
+                        }
+                        db.Update(cardEntity);
+                    }
+                }
+
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

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

@@ -264,6 +264,14 @@
     <Compile Include="LR_Desktop\MessageRind\MessageRindBLL.cs" />
     <Compile Include="LR_Desktop\MessageRind\MessageRindIBLL.cs" />
     <Compile Include="LR_Desktop\MessageRind\MessageRindService.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_CardSortManage\SSO_Drag_CardSortManageBLL.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_CardSortManage\SSO_Drag_CardSortManageEntity.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_CardSortManage\SSO_Drag_CardSortManageIBLL.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_CardSortManage\SSO_Drag_CardSortManageService.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_DesktopManage\SSO_Drag_DesktopManageBLL.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_DesktopManage\SSO_Drag_DesktopManageEntity.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_DesktopManage\SSO_Drag_DesktopManageIBLL.cs" />
+    <Compile Include="LR_Desktop\SSO_Drag_DesktopManage\SSO_Drag_DesktopManageService.cs" />
     <Compile Include="LR_Desktop\WeChatDevelop\WeChatDevelopBLL.cs" />
     <Compile Include="LR_Desktop\WeChatDevelop\WeChatDevelopEntity.cs" />
     <Compile Include="LR_Desktop\WeChatDevelop\WeChatDevelopIBLL.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Permission/Perm_Function/Perm_FunctionEntity.cs

@@ -1,5 +1,6 @@
 using Learun.Util;
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Learun.Application.TwoDevelopment.Permission
@@ -99,6 +100,11 @@ namespace Learun.Application.TwoDevelopment.Permission
 
         [NotMapped]
         public string UPId { get; set; }
+        /// <summary>
+        /// 子项列表
+        /// </summary>
+        [NotMapped]
+        public List<Perm_FunctionEntity> PFunctionList { get; set; }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordBLL.cs

@@ -7,7 +7,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
 {
     /// <summary>
     /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
-    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// Copyright (c) 2013-2018 数字化校园 
     /// 创 建：超级管理员
     /// 日 期：2020-05-08 15:48
     /// 描 述：学生充值记录
@@ -66,6 +66,31 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuSaveRecordEntity> GetListByAccount(string account)
+        {
+            try
+            {
+                return stuSaverecordService.GetListByAccount(account);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordIBLL.cs

@@ -6,7 +6,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
 {
     /// <summary>
     /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
-    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// Copyright (c) 2013-2018 数字化校园 
     /// 创 建：超级管理员
     /// 日 期：2020-05-08 15:48
     /// 描 述：学生充值记录
@@ -27,6 +27,13 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <summary>
         /// <returns></returns>
         StuSaveRecordEntity GetStuSaveRecordEntity(string keyValue);
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<StuSaveRecordEntity> GetListByAccount(string account);
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordService.cs

@@ -10,7 +10,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
 {
     /// <summary>
     /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
-    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// Copyright (c) 2013-2018 数字化校园 
     /// 创 建：超级管理员
     /// 日 期：2020-05-08 15:48
     /// 描 述：学生充值记录
@@ -132,6 +132,30 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuSaveRecordEntity> GetListByAccount(string account)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindList<StuSaveRecordEntity>(x => x.OUTID == account);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region  提交数据