增加扫码报到界面功能

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

@@ -0,0 +1,137 @@
+.welcome {
+    padding: 1px 12px 20px;
+    background: #fff;
+}
+
+.welT {
+    font-size: 16px;
+    margin-bottom: 10px;
+    line-height: 26px;
+}
+
+    .welT i {
+        width: 26px;
+        height: 26px;
+        line-height: 24px;
+        border: 1px solid #efefef;
+        border-radius: 4px;
+        float: right;
+        text-align: center;
+        color: #999;
+    }
+
+.welLine {
+    height: 1px;
+    background: #efefef;
+    margin: 10px -12px;
+}
+
+.welText {
+    overflow: hidden;
+    font-size: 14px;
+    margin-top: 5px;
+}
+
+    .welText span {
+        float: right;
+        width: 60%;
+        text-align: right;
+    }
+
+.welInput {
+    overflow: hidden;
+    font-size: 14px;
+    margin-top: 10px;
+}
+
+    .welInput span {
+        float: left;
+        width: 26%;
+        text-align: right;
+        line-height: 30px;
+    }
+
+    .welInput input {
+        display: block;
+        margin-left: 28%;
+        width: 72%;
+        border: 1px solid #efefef;
+        border-radius: 4px;
+        height: 30px;
+        line-height: 28px;
+        padding: 0 10px;
+        margin-bottom: 0;
+    }
+
+.welCon {
+    padding: 10px;
+    border: 1px solid #efefef;
+    margin-top: 18px;
+    border-radius: 4px;
+    position: relative;
+}
+
+.welDel {
+    position: absolute;
+    top: -8px;
+    left: -8px;
+    background: #fff;
+}
+
+    .welDel i {
+        text-align: center;
+        width: 26px;
+        height: 26px;
+        display: block;
+        line-height: 24px;
+        border: 1px solid #efefef;
+        border-radius: 50%;
+    }
+
+.welImgAdd {
+    text-align: center;
+    line-height: 0;
+}
+
+#files {
+    opacity: 0;
+    -webkit-opacity: 0;
+    z-index: 9;
+    display: none;
+}
+
+#welImgBtn {
+    display: block;
+    width: 110px;
+    height: 30px;
+    text-align: center;
+    line-height: 26px;
+    border: 2px solid #efefef;
+    border-radius: 4px;
+    font-size: 14px;
+    color: #999;
+    margin: 10px auto;
+    cursor: pointer;
+}
+
+#PhotoImg {
+    width: 200px;
+    height: 200px;
+    margin: 30px auto;
+}
+
+    #PhotoImg img {
+        width: 100%;
+        height: 100%;
+    }
+
+.btnBox {
+    margin-top: 20px;
+    text-align: center;
+}
+
+#saveBtn {
+    margin: auto;
+    margin-top: 25px;
+    width: 92%;
+}

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

@@ -0,0 +1,70 @@
+<div class="welcome">
+    <div class="welT">报到二维码</div>
+    <div class="welBox">
+        <div class="welImgAdd">
+            <div id="PhotoImg"></div>
+        </div>
+    </div>
+    <div class="welLine"></div>
+    <div class="welT">报到信息</div>
+    <div class="welBox">
+        <input type="hidden" name="ID" value="" id="ID" />
+        <div class="welText">
+            学号
+            <span id="StuNo"></span>
+        </div>
+        <div class="welText">
+            准考证号
+            <span id="zkzh"></span>
+        </div>
+        <div class="welText">
+            考生号
+            <span id="ksh"></span>
+        </div>
+        <div class="welText">
+            姓名 <span id="StuName"></span>
+        </div>
+        <div class="welText">
+            性别
+            <span id="GenderNo"></span>
+        </div>
+        <div class="welText">
+            系别
+            <span id="DeptNo"></span>
+        </div>
+        <div class="welText">
+            专业
+            <span id="MajorNo"></span>
+        </div>
+        <div class="welText">
+            班级
+            <span id="ClassNo"></span>
+        </div>
+        <div class="welText">
+            班主任编号
+            <span id="ClassDiredctorNo"></span>
+        </div>
+        <div class="welText">
+            班主任姓名
+            <span id="ClassDiredctorName"></span>
+        </div>
+        <div class="welText">
+            班主任电话
+            <span id="ClassDiredctorMobile"></span>
+        </div>
+        <div class="welText">
+            辅导员编号
+            <span id="ClassTutorNo"></span>
+        </div>
+        <div class="welText">
+            辅导员姓名
+            <span id="ClassTutorName"></span>
+        </div>
+        <div class="welText">
+            辅导员电话
+            <span id="ClassTutorMobile"></span>
+        </div>
+    </div>
+    <div class="welLine"></div>
+
+</div>

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

@@ -0,0 +1,80 @@
+(function () {
+    var colDataItemArr = ['GenderNo'];
+    var colDataItemCode = ['usersex'];
+
+    var page = {
+        isScroll: false,
+        init: function ($page) {
+            // 获取登录者信息
+            var userinfo = learun.storage.get('userinfo');
+
+            //数据绑定 
+            learun.layer.loading(true, '获取数据中');
+            learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", {}, (data) => {
+                if (data) {
+                    //判断是否显示报到二维码：未确认报到，且已完善信息，且缴费三有一；
+                    var entity = data["StuInfoFreshEntity"];
+                    if (entity.RegisterStatus == "1") {
+                        learun.layer.loading(false);
+                        learun.layer.confirm('新生已确认报到！', function (_index) {
+                            learun.nav.closeCurrent();
+                        }, '智慧校园提示', ['确定']);
+                        return false;
+                    }
+                    if (entity.IsCompleteInfo == "未完善") {
+                        learun.layer.loading(false);
+                        learun.layer.confirm('新生未完善个人信息，无法报到！', function (_index) {
+                            learun.nav.closeCurrent();
+                        }, '智慧校园提示', ['确定']);
+                        return false;
+                    }
+                    if (entity.PayFeeStatus == "未缴费" && (entity.StudentLoan == null || entity.StudentLoan == "" || entity.StudentLoan == undefined) && entity.OnsitePayFeeStatus != "1") {
+                        learun.layer.loading(false);
+                        learun.layer.confirm('新生未缴费，无法报到！', function (_index) {
+                            learun.nav.closeCurrent();
+                        }, '智慧校园提示', ['确定']);
+                        return false;
+                    }
+
+                    //报到信息
+                    for (var id in entity) {
+                        var dom = $('#' + id)[0];
+                        if (dom) {
+                            if (dom.tagName.toLowerCase() == "span") {
+                                $('#' + id).html(entity['' + id + '']);
+                                //数据字典
+                                if ($.inArray(id, colDataItemArr) >= 0) {
+                                    learun.clientdata.get('dataItem', {
+                                        code: colDataItemCode[$.inArray(id, colDataItemArr)],
+                                        key: entity['' + id + ''],
+                                        callback: function (data, op) {
+                                            $('#' + id).html(data.text);
+                                        }
+                                    });
+                                }
+
+                            } else if (dom.tagName.toLowerCase() == "input") {
+                                $('#' + id).val(entity['' + id + '']);
+                            }
+                        }
+                    }
+                    //二维码
+                    learun.code.encode({ id: 'PhotoImg', text: userinfo.baseinfo.account });
+
+                    page.bind($page);
+
+                    learun.layer.loading(false);
+                }
+
+            });
+
+
+        },
+        bind: function ($page) {
+
+        }
+    };
+
+
+    return page;
+})();

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

@@ -0,0 +1,131 @@
+
+.welcome {
+    padding: 1px 12px 20px;
+    background: #fff;
+}
+
+.welT {
+    font-size: 16px;
+    margin-bottom: 10px;
+    line-height: 26px;
+}
+
+    .welT i {
+        width: 26px;
+        height: 26px;
+        line-height: 24px;
+        border: 1px solid #efefef;
+        border-radius: 4px;
+        float: right;
+        text-align: center;
+        color: #999;
+    }
+
+.welLine {
+    height: 1px;
+    background: #efefef;
+    margin: 10px -12px;
+}
+
+.welText {
+    overflow: hidden;
+    font-size: 14px;
+    margin-top: 5px;
+}
+
+    .welText span {
+        float: right;
+        width: 60%;
+        text-align: right;
+    }
+
+.welInput {
+    overflow: hidden;
+    font-size: 14px;
+    margin-top: 10px;
+}
+
+    .welInput span {
+        float: left;
+        width: 26%;
+        text-align: right;
+        line-height: 30px;
+    }
+
+    .welInput input {
+        display: block;
+        margin-left: 28%;
+        width: 72%;
+        border: 1px solid #efefef;
+        border-radius: 4px;
+        height: 30px;
+        line-height: 28px;
+        padding: 0 10px;
+        margin-bottom: 0;
+    }
+
+.welCon {
+    padding: 10px;
+    border: 1px solid #efefef;
+    margin-top: 18px;
+    border-radius: 4px;
+    position: relative;
+}
+
+.welDel {
+    position: absolute;
+    top: -8px;
+    left: -8px;
+    background: #fff;
+}
+
+    .welDel i {
+        text-align: center;
+        width: 26px;
+        height: 26px;
+        display: block;
+        line-height: 24px;
+        border: 1px solid #efefef;
+        border-radius: 50%;
+    }
+
+.welImgAdd {
+    text-align: center;
+    line-height: 0;
+}
+
+#files {
+    opacity: 0;
+    -webkit-opacity: 0;
+    z-index: 9;
+    display: none;
+}
+
+#welImgBtn {
+    display: block;
+    width: 110px;
+    height: 30px;
+    text-align: center;
+    line-height: 26px;
+    border: 2px solid #efefef;
+    border-radius: 4px;
+    font-size: 14px;
+    color: #999;
+    margin: 10px auto;
+    cursor: pointer;
+}
+
+#PhotoImg {
+    width: 110px;
+}
+
+.btnBox {
+    margin-top: 30px;
+    text-align: center;
+}
+
+#saveBtn {
+    margin: auto;
+    margin-top: 25px;
+    width: 92%;
+}

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

@@ -0,0 +1,15 @@
+<div class="welcome">
+    
+    <div class="welBox">
+        <div class="welInput">
+            <span>贷款回执码</span>
+            <input id="ID" type="hidden"/>
+            <input id="StudentLoan" type="text" placeholder="请填写贷款回执码" />
+        </div>
+    </div>
+    <div class="welLine"></div>
+    
+    <div class="btnBox">
+        <button id="saveBtn" type="button" class="lr-btn-primary lr-btn-block">保存</button>
+    </div>
+</div>

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

@@ -0,0 +1,44 @@
+(function () {
+    var page = {
+        isScroll: false,
+        init: function ($page) {
+            //数据绑定 
+            learun.layer.loading(true, '获取数据中');
+            learun.httpget(config.webapi + "StuInfoFresh/stuInfoFresh", {}, (data) => {
+                if (data) {
+                    for (var id in data) {
+                        if (id == "StuInfoFreshEntity") {
+                            $("#ID").val(data[id].ID);
+                            $("#StudentLoan").val(data[id].StudentLoan);
+                        }
+                    }
+                    page.bind($page);
+                    learun.layer.loading(false);
+                }
+            });
+
+            //保存
+            $page.find('#saveBtn').on('tap', function () {
+                var postdata = {
+                    ID: $('#ID').val(),
+                    StudentLoan: $('#StudentLoan').val()
+                };
+                learun.httpget(config.webapi + "StuInfoFresh/saveLoan", postdata, (data) => {
+                    if (data) {
+                        learun.layer.toast('保存成功');
+                        setTimeout(function () {
+                            learun.nav.closeCurrent();
+                        }, 2000);
+                    }
+                });
+
+            });
+
+        },
+        bind: function ($page) {
+
+        }
+    };
+
+    return page;
+})();

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

@@ -35,7 +35,7 @@
     <div class="noticeBox">
         <div class="noticeTitle">报到内容</div>
         <div class="noticeTxt">
-            <span>是否完善个人信息</span><span id="ClassTutorNo">未完善</span>
+            <span>是否完善个人信息</span><span id="IsCompleteInfo">未完善</span>
         </div>
         <div class="noticeTxt">
             <span>交档案状态</span><span id="CollectFileStatus">未提交</span>

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

@@ -19,7 +19,7 @@
                         $('#PayFeeStatus').html(entity.PayFeeStatus);
                         $('#CollectFileStatus').html(entity.CollectFileStatus);
                         $('#GetKeyStatus').html(entity.GetKeyStatus);
-                        $('#ClassTutorNo').html(entity.ClassTutorNo);
+                        $('#IsCompleteInfo').html(entity.IsCompleteInfo);
                         $('#Dormitory').html(entity.DormitoryName);
                     }
                 }

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

@@ -0,0 +1,112 @@
+.enSecBox{
+	min-height: 100%;
+	background-color: #fff;
+}
+.ensTime{
+	position: relative;
+	text-align: center;
+	line-height: 24px;
+	font-size: 14px;
+	color: #B8E2FF;
+}
+.ensTime:after,.ensTime::before{
+	content: '';
+	width: .12rem;
+	height: .12rem;
+	background-color: #B8E2FF;
+	border-radius: 50%;
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	margin: auto;
+}
+.ensTime:after{
+	right: 20%;
+}
+.ensTime::before{
+	left: 20%;
+}
+.ensHeader{
+	background-color: #0C86D8;
+	padding: .4rem 0;
+}
+.ensHeadT{
+	font-size: 18px;
+	color: #fff;
+	text-align: center;
+	margin-top: .3rem;
+}
+.ensSec1{
+	padding: 0 15px;
+}
+.eSec1Box{
+	position: relative;
+	margin-top: .4rem;
+}
+.eSec1Box:first-child{
+	margin-top: .2rem;
+}
+.sSecDown{
+	position: absolute;
+	width: .5rem;
+	left: 0;
+	right: 0;
+	top: -.08rem;
+	margin: auto;
+}
+.eSec1Top{
+	font-size: 14px;
+	font-weight: bold;
+	color: #ABDDFF;
+	font-style: italic;
+	padding-left: .35rem;
+}
+.eSec1Top span {
+	color: #0C86D8;
+	font-size: 20px;
+	margin-left: 5px;
+}
+.sSec1Con{
+	padding: .1rem .3rem .1rem .5rem;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-top: .2rem;
+}
+.sSec1Type1{
+	border: 2px solid #AEE8CF;
+	border-radius: .6rem;
+}
+.sSec1Type1 .sSec1State{
+	color: #12B215;
+}
+.sSec1Type2{
+	border: 2px solid #B8E2FF;
+	border-radius: .65rem;
+}
+.sSec1Type2 .sSec1State{
+	color: #17AAEE;
+}
+.sSec1Con > img{
+	width: .6rem;
+}
+.sSec1State{
+	font-size: 14px;
+} 
+.sSec1Txt{
+	font-size: 16px;
+	text-align: center;
+	color: #1A1A1A;
+	margin: .1rem 0;
+}
+.sSec1Txt span{
+	display: block;
+	color: #9A9A9A;
+	margin-top: 2px;
+	font-size: 12px;
+}
+
+
+
+
+

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

@@ -0,0 +1,61 @@
+<div class="enSecBox">
+	<!-- 已完成 类名 sSec1Type1 图片   enter1-1 enter1-2 enter1-3 enter1-4 enter1-5-->
+	<!-- 未完成 类名 sSec1Type2 图片   enter2-1 enter2-2 enter2-3 enter2-4 enter2-5-->
+	<!-- 可以点击类名  sSec1Tap -->
+	<div class="ensHeader">
+		<div class="ensTime">2020</div>
+		<div class="ensHeadT">新生入校流程</div>
+	</div>
+	<div class="ensSec1">
+		<div class="eSec1Box">
+			<div class="eSec1Top">step<span>1</span></div>
+			<div class="sSec1Con sSec1Type1" id="IsCompleteInfo">
+				<img src="images/enter1-1.png" alt="">
+				<div class="sSec1Txt">
+					完善学生信息
+				</div>
+				<div class="sSec1State">已完成</div>
+			</div>
+		</div>
+		<div class="eSec1Box">
+			<img src="images/enter1-6.png" alt="" class="sSecDown">
+			<div class="eSec1Top">step<span>2</span></div>
+			<div class="sSec1Con sSec1Type2" id="PayFeeStatus">
+				<img src="images/enter1-2.png" alt="">
+				<div class="sSec1Txt">
+					线上缴费
+					<span>( 已缴费、未缴费 )</span>
+				</div>
+				<div class="sSec1State">未完成</div>
+			</div>
+			<div class="sSec1Con sSec1Type1" id="StudentLoan">
+				<img src="images/enter1-3.png" alt="">
+				<div class="sSec1Txt">
+					助学贷款
+					<span>( 填写贷款回执码 )</span>
+				</div>
+				<div class="sSec1State">已完成</div>
+			</div>
+			<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 class="eSec1Box">
+			<img src="images/enter1-6.png" alt="" class="sSecDown">
+			<div class="eSec1Top">step<span>3</span></div>
+			<div class="sSec1Con sSec1Type2" id="RegisterStatus">
+				<img src="images/enter2-5.png" alt="">
+				<div class="sSec1Txt">
+					报到注册
+					<span>( 生成报到二维码，并显示报到教室 )</span>
+				</div>
+				<div class="sSec1State">未完成</div>
+			</div>
+		</div>
+	</div>
+</div>

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

@@ -0,0 +1,83 @@
+(function () {
+    (function fontSize() {
+        var html = document.documentElement;
+        var windowWidth = html.clientWidth;
+        html.style.fontSize = 100 * (windowWidth / 750) + 'px';
+    })()
+    var page = {
+        isScroll: false,
+        init: function ($page) {
+            //数据绑定 
+            learun.layer.loading(true, '获取数据中');
+            learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", {}, (data) => {
+                if (data) {
+                    for (var id in data) {
+                        if (id == "StuInfoFreshEntity") {
+                            //todo:乱码
+                            console.log(data[id].IsCompleteInfo == "已完善");//false
+
+                            if (data[id].IsCompleteInfo == "已完善") {
+                                completeStyle("#IsCompleteInfo", "images/enter1-1.png");
+                            } else {
+                                notCompleteStyle("#IsCompleteInfo", "images/enter2-1.png");
+                            }
+                            if (data[id].PayFeeStatus == "已缴费") {
+                                completeStyle("#PayFeeStatus", "images/enter1-2.png");
+                            } else {
+                                notCompleteStyle("#PayFeeStatus", "images/enter2-2.png");
+                            }
+                            if (data[id].StudentLoan == null || data[id].StudentLoan == "" || data[id].StudentLoan == undefined) {
+                                notCompleteStyle("#StudentLoan", "images/enter2-3.png");
+                            } else {
+                                completeStyle("#StudentLoan", "images/enter1-3.png");
+                            }
+                            if (data[id].OnsitePayFeeStatus == "1") {
+                                completeStyle("#OnsitePayFeeStatus", "images/enter1-4.png");
+                            } else {
+                                notCompleteStyle("#OnsitePayFeeStatus", "images/enter2-4.png");
+                            }
+                            if (data[id].RegisterStatus == "1") {
+                                completeStyle("#RegisterStatus", "images/enter1-5.png");
+                            } else {
+                                notCompleteStyle("#RegisterStatus", "images/enter2-5.png");
+                            }
+
+                        }
+                    }
+                    page.bind($page);
+                    learun.layer.loading(false);
+                }
+            });
+
+            //点击步骤
+            $page.on('tap', '#IsCompleteInfo', function () {
+                learun.nav.go({ path: 'welcome', title: '完善新生信息', isBack: true, isHead: true, param: {}, type: 'right' });
+            });
+            $page.on('tap', '#RegisterStatus', function () {
+                learun.nav.go({ path: '/EducationalAdministration/StuInfoFresh/RegisterQRCode', title: '生成报到二维码', isBack: true, isHead: true, param: {}, type: 'right' });
+            });
+            $page.on('tap', '#StudentLoan', function () {
+                learun.nav.go({ path: '/EducationalAdministration/StuInfoFresh/StudentLoan', title: '填写贷款回执码', isBack: true, isHead: true, param: {}, type: 'right' });
+            });
+
+        },
+        bind: function ($page) {
+
+        }
+    };
+    //已完成样式
+    var completeStyle = function (box, img) {
+        $(box).removeClass("sSec1Type2").addClass("sSec1Type1");
+        $(box).find(".sSec1State").html("已完成");
+        $(box).find('img').attr("src", img);
+    };
+    //已完成样式
+    var notCompleteStyle = function (box, img) {
+        $(box).removeClass("sSec1Type1").addClass("sSec1Type2");
+        $(box).find(".sSec1State").html("未完成");
+        $(box).find('img').attr("src", img);
+
+    };
+
+    return page;
+})();

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

@@ -25,7 +25,7 @@
                         @*<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_loan" class="btn btn-default"><i class="fa fa-plus"></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

@@ -175,7 +175,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: '线上缴费时间', name: 'PayFeeDate', width: 130, align: "left" },
-                    { label: '助学贷款', name: 'StudentLoan', width: 130, align: "left" },
+                    { label: '贷款回执码', name: 'StudentLoan', width: 130, align: "left" },
                     {
                         label: '现场缴费状态', name: 'OnsitePayFeeStatus', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {

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

@@ -18,8 +18,10 @@ namespace Learun.Application.WebApi.Modules
             : base("/StuInfoFresh")
         {
             Get["/stuInfoFreshEntity"] = GetStuInfoFreshEntity;
+            Get["/stuInfoFresh"] = GetStuInfoFresh;
             Get["/stuInfoFreshEntityByStuNo"] = GetStuInfoFreshEntityByStuNo;
             Get["/saveStuInfoFresh"] = GetSaveStuInfoFresh;
+            Get["/saveLoan"] = GetSaveLoan;
             Post["/savePhoto"] = GetSavePhoto;
             Get["/payFeeDetail"] = GetPayFeeDetail;
 
@@ -49,20 +51,27 @@ namespace Learun.Application.WebApi.Modules
             if (StuInfoFreshEntity != null)
             {
                 //处理数据源
-                StuInfoFreshEntity.MajorNo = cdMajorIBLL.GetCdMajorEntityByMajorNo(StuInfoFreshEntity.MajorNo).MajorName;
-                StuInfoFreshEntity.DeptNo = cdDeptIBLL.GetCdDeptEntityByNo(StuInfoFreshEntity.DeptNo).DeptName;
+                StuInfoFreshEntity.MajorNo = cdMajorIBLL.GetCdMajorEntityByMajorNo(StuInfoFreshEntity.MajorNo)?.MajorName;
+                StuInfoFreshEntity.DeptNo = cdDeptIBLL.GetCdDeptEntityByNo(StuInfoFreshEntity.DeptNo)?.DeptName;
 
                 var classInfoEntity = classInfoIBLL.GetClassInfoEntityByClassNo(StuInfoFreshEntity.ClassNo);
                 if (classInfoEntity != null)
                 {
                     StuInfoFreshEntity.ClassNo = classInfoEntity.ClassName;
                     StuInfoFreshEntity.ClassTutorNo = classInfoEntity.ClassTutorNo;
+                    StuInfoFreshEntity.ClassDiredctorNo = classInfoEntity.ClassDiredctorNo;
                     var empInfoEntity = empInfoIBLL.GetEmpInfoEntityByEmpNo(classInfoEntity.ClassTutorNo);
                     if (empInfoEntity != null)
                     {
                         StuInfoFreshEntity.ClassTutorName = empInfoEntity.EmpName;
                         StuInfoFreshEntity.ClassTutorMobile = empInfoEntity.mobile;
                     }
+                    var empInfoEntity2 = empInfoIBLL.GetEmpInfoEntityByEmpNo(classInfoEntity.ClassTutorNo);
+                    if (empInfoEntity2 != null)
+                    {
+                        StuInfoFreshEntity.ClassDiredctorName = empInfoEntity2.EmpName;
+                        StuInfoFreshEntity.ClassDiredctorMobile = empInfoEntity2.mobile;
+                    }
                 }
                 if (StuInfoFreshEntity.PayFeeStatus == "1")
                 {
@@ -103,7 +112,7 @@ namespace Learun.Application.WebApi.Modules
                 //是否完善信息
                 StuInfoFreshFamilyList = stuInfoFreshIBLL.GetStuInfoFreshFamilyList(StuInfoFreshEntity.ID).ToList();
                 StuInfoFreshEmergePeopleList = stuInfoFreshIBLL.GetStuInfoFreshEmergePeopleList(StuInfoFreshEntity.ID).ToList();
-                StuInfoFreshEntity.ClassTutorNo = StuInfoFreshFamilyList.Any() ? "已完善" : "未完善";
+                StuInfoFreshEntity.IsCompleteInfo = StuInfoFreshFamilyList.Any() ? "已完善" : "未完善";
 
             }
 
@@ -224,6 +233,22 @@ namespace Learun.Application.WebApi.Modules
             return Success("保存成功");
         }
         /// <summary>
+        /// 保存个人信息
+        /// </summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        private Response GetSaveLoan(dynamic _)
+        {
+            var model = this.GetReqData<StuInfoFreshModel>();
+
+            var entity = stuInfoFreshIBLL.GetStuInfoFreshEntity(model.ID);
+            entity.StudentLoan = model.StudentLoan;
+
+            stuInfoFreshIBLL.SaveEntity(entity.ID, entity);
+
+            return Success("保存成功");
+        }
+        /// <summary>
         /// 头像
         /// </summary>
         /// <param name="_"></param>
@@ -334,6 +359,10 @@ namespace Learun.Application.WebApi.Modules
             /// </summary>
             public string Photo { get; set; }
             /// <summary>
+            /// 贷款回执码
+            /// </summary>
+            public string StudentLoan { get; set; }
+            /// <summary>
             /// 家庭成员
             /// </summary>
             public List<StuInfoFreshFamilyEntity> StuInfoFreshFamilyEntities { get; set; }

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

@@ -652,6 +652,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [NotMapped]
         public string ClassDiredctorNo { get; set; }
+        /// <summary>
+        /// 班主任名称
+        /// </summary>
+        [NotMapped]
+        public string ClassDiredctorName { get; set; }
+        /// <summary>
+        /// 班主任电话
+        /// </summary>
+        [NotMapped]
+        public string ClassDiredctorMobile { get; set; }
+        /// <summary>
+        /// 是否完善信息
+        /// </summary>
+        [NotMapped]
+        public string IsCompleteInfo { get; set; }
 
 
         /// <summary>