给手机端添加学生考试安排功能

给PC端添加老师和学生考试安排
修改登录跳转地址

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

@@ -0,0 +1,8 @@
+<div class="lr-page lr-ArrangeExamTermNew-page"> 
+    <div class="lr-page-tool"> 
+        <div class="lr-tool-left"> 
+            总共<span class="lr-badge lr-badge-primary">0</span>条 
+        </div> 
+    </div> 
+    <div class="lr-page-content" id="lr_list"></div>
+</div>

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

@@ -0,0 +1,74 @@
+(function() {
+	var multipleData = null;
+	var page = {
+		grid: null,
+		init: function($page) {
+			page.grid = $page.find('#lr_list').lrpagination({
+				lclass: page.lclass,
+				rows: 10, // 每页行数 
+				getData: function(param, callback) { // 获取数据 param 分页参数,callback 异步回调 
+					param.multipleData = multipleData;
+					page.loadData(param, callback, $page);
+				},
+				renderData: function(_index, _item, _$item) { // 渲染数据模板 
+					return page.rowRender(_index, _item, _$item, $page);
+				},
+			});
+		},
+		lclass: 'lr-list',
+		loadData: function(param, callback, $page) { // 列表加载后台数据 
+			var _postParam = {
+				pagination: {
+					rows: param.rows,
+					page: param.page,
+					sidx: 'ExamDate,ExamTime,LessonNo,EmpNo,ClassRoomName,SitNumber',
+					sord: 'asc',
+				},
+				queryJson: '{}'
+			};
+			if (param.multipleData) {
+				_postParam.queryJson = JSON.stringify(multipleData);
+			}
+
+			var baseUser = JSON.parse(localStorage.userinfo);
+			_postParam.queryJson = JSON.stringify({ StuNo: baseUser.baseinfo.account });
+			learun.httpget(config.webapi + '/learun/ask/teststulist', _postParam, (data) => {
+				$page.find('.lr-badge').text('0');
+				if (data) {
+					$page.find('.lr-badge').text(data.records);
+					callback(data.rows, parseInt(data.records));
+				} else {
+					callback([], 2);
+				}
+			});
+		},
+		rowRender: function(_index, _item, _$item, $page) { // 渲染列表行数据 
+			_$item.addClass('lr-list-item lr-list-item-multi');
+			_$item.append($('<p class="lr-ellipsis"><span>考试日期:</span></p>').dataFormatter({
+				value: _item.ExamDate,
+                type: 'datetime',
+                dateformat: 'yyyy-MM-dd'
+			}));
+			_$item.append($('<p class="lr-ellipsis"><span>考试时间:</span></p>').dataFormatter({
+				value: _item.ExamTime
+			}));
+			_$item.append($('<p class="lr-ellipsis"><span>课程编号:</span></p>').dataFormatter({
+				value: _item.LessonNo
+			}));
+			_$item.append($('<p class="lr-ellipsis"><span>课程名称:</span></p>').dataFormatter({
+				value: _item.LessonName
+			}));
+			_$item.append($('<p class="lr-ellipsis"><span>监考老师:</span></p>').dataFormatter({
+				value: _item.EmpName
+			}));
+			_$item.append($('<p class="lr-ellipsis"><span>教室名称:</span></p>').dataFormatter({
+				value: _item.ClassRoomName
+			}));
+			_$item.append($('<p class="lr-ellipsis"><span>座位编号:</span></p>').dataFormatter({
+				value: _item.SitNumber
+			}));
+			return '';
+		},
+	};
+	return page;
+})();

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

@@ -59,6 +59,19 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
              return View();
         }
+
+
+
+        public ActionResult IndexTeach()
+        {
+            return View();
+        }
+
+        public ActionResult IndexStudent()
+        {
+            return View();
+        }
+
         #endregion
 
         #region 获取数据

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

@@ -0,0 +1,36 @@
+@{
+    ViewBag.Title = "排考2021新";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="LessonNo" type="lrselect" class="lr-select" style="width: 200px;"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="ClassRoomNo" type="lrselect" class="lr-select" style="width: 200px;"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="EmpNo" type="lrselect" class="lr-select" style="width: 200px;"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch" class="datetime"></div>
+                    </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>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/ArrangeExamTermNew/IndexStudent.js")

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

@@ -0,0 +1,100 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-12-08 12:19
+ * 描  述：排考2021新
+ */
+var selectedRow;
+var refreshGirdData;
+
+var bootstrap = function ($, learun) {
+    "use strict";
+    var datebegin = '';
+    var dateend = '';
+    var ClassNo = '';
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('.datetime').each(function () {
+                $(this).lrdate({
+                    dfdata: [
+                        { name: '清空', begin: function () { return '' }, end: function () { return '' } },
+                        { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                        { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                        { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                        { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    ],
+                    // 月
+                    mShow: false,
+                    premShow: false,
+                    // 季度
+                    jShow: false,
+                    prejShow: false,
+                    // 年
+                    ysShow: false,
+                    yxShow: false,
+                    preyShow: false,
+                    yShow: false,
+                    // 默认
+                    dfvalue: '0',
+                    selectfn: function (begin, end) {
+                        datebegin = begin;
+                        dateend = end;
+                    }
+                });
+            });
+            // 查询
+            $('#btn_Search').on('click', function () {
+                page.search({ ClassNo: ClassNo, AcademicYearNo: $('#AcademicYearNo').lrselectGet(), Semester: $('#Semester').lrselectGet(), LessonNo: $('#LessonNo').lrselectGet(), ClassRoomNo: $('#ClassRoomNo').lrselectGet(), EmpNo: $('#EmpNo').lrselectGet() });
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            $('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname', placeholder: '请选择课程' });
+            $('#ClassRoomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname', placeholder: '请选择教室' });
+            $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname', placeholder: '请选择教师' });
+        },
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/ArrangeExamTermNew/GetItemPageList',
+                headData: [
+                    { label: '学年', name: 'AcademicYearNo', width: 70, align: "left" },
+                    { label: '学期', name: 'Semester', width: 60, align: "left" },
+                    { label: '考试日期', name: 'ExamDate', width: 120, align: "left" },
+                    { label: '考试时间', name: 'ExamTime', width: 120, align: "left" },
+                    { label: '课程编号', name: 'LessonNo', width: 100, align: "left" },
+                    { label: '课程名称', name: 'LessonName', width: 200, align: "left" },
+                    { label: '监考教师编号', name: 'EmpNo', width: 150, align: "left" },
+                    { label: '监考教师姓名', name: 'EmpName', width: 150, align: "left" },
+                    { label: '教室编号', name: 'ClassRoomNo', width: 100, align: "left" },
+                    { label: '教室名称', name: 'ClassRoomName', width: 100, align: "left" },
+                    { label: '班级名称', name: 'ClassName', width: 100, align: "left" },
+                    { label: '学生编号', name: 'StuNo', width: 100, align: "left" },
+                    { label: '学生姓名', name: 'StuName', width: 200, align: "left" },
+                    { label: '座位编号', name: 'SitNumber', width: 100, aligndd: "left" }
+                ],
+                mainId: 'AETId',
+                sidx: 'ExamDate asc, LessonNo asc,ClassRoomNo asc,ClassNo asc,SitNumber asc',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.StartTime = datebegin;
+            param.EndTime = dateend;
+            var loginInfo = learun.clientdata.get(['userinfo']);
+            param.StuNo = loginInfo.account; 
+            console.log(param.StuNo);
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

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

@@ -0,0 +1,39 @@
+@{
+    ViewBag.Title = "排考2021新";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="AcademicYearNo" type="lrselect" class="lr-select lr-selectLittle" style="width: 80px;"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="Semester" type="lrselect" class="lr-select lr-selectLittle" style="width: 80px;"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="LessonNo" type="lrselect" class="lr-select" style="width: 200px;"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch" class="datetime"></div>
+                    </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_arrange" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;排考数据同步</a>
+                        </div>*@
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/ArrangeExamTermNew/IndexTeach.js")

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

@@ -0,0 +1,111 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-12-08 12:19
+ * 描  述：排考2021新
+ */
+var selectedRow;
+var refreshGirdData;
+
+var bootstrap = function ($, learun) {
+    "use strict";
+    var datebegin = '';
+    var dateend = '';
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('.datetime').each(function () {
+                $(this).lrdate({
+                    dfdata: [
+                        { name: '清空', begin: function () { return '' }, end: function () { return '' } },
+                        { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                        { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                        { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                        { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    ],
+                    // 月
+                    mShow: false,
+                    premShow: false,
+                    // 季度
+                    jShow: false,
+                    prejShow: false,
+                    // 年
+                    ysShow: false,
+                    yxShow: false,
+                    preyShow: false,
+                    yShow: false,
+                    // 默认
+                    dfvalue: '0',
+                    selectfn: function (begin, end) {
+                        datebegin = begin;
+                        dateend = end;
+                    }
+                });
+            });
+            // 查询
+            $('#btn_Search').on('click', function () {
+                page.search({ AcademicYearNo: $('#AcademicYearNo').lrselectGet(), Semester: $('#Semester').lrselectGet(), LessonNo: $('#LessonNo').lrselectGet()});
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            $('#AcademicYearNo').lrselect({
+                placeholder: "学年",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "学期",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData',
+                value: 'value',
+                text: 'text'
+            });
+            //课程
+            $('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname', placeholder:'请选择课程' });
+        },
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/ArrangeExamTermNew/GetPageList',
+                headData: [
+                    {
+                        label: '考试日期', name: 'ExamDate', width: 200, align: "left", formatter: function (v) {
+                            return learun.formatDate(v, "yyyy-MM-dd");
+                        }
+                    },
+                    { label: '考试时间', name: 'ExamTime', width: 200, align: "left" },
+                    { label: '课程编号', name: 'LessonNo', width: 200, align: "left" },
+                    { label: '课程名称', name: 'LessonName', width: 200, align: "left" },
+                    { label: '教师编号', name: 'EmpNo', width: 200, align: "left" },
+                    { label: '教师姓名', name: 'EmpName', width: 200, align: "left" },
+                    { label: '教室编号', name: 'ClassRoomNo', width: 200, align: "left" },
+                    { label: '教室名称', name: 'ClassRoomName', width: 200, align: "left" }
+                ],
+                mainId: 'AETId',
+                sidx: 'ExamDate asc,ExamTime asc,LessonNo asc,ClassRoomNo asc',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.StartTime = datebegin;
+            param.EndTime = dateend;
+            var loginInfo = learun.clientdata.get(['userinfo']);
+            param.EmpNo = loginInfo.account;
+            console.log(param.EmpNo,111);
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -930,8 +930,10 @@
     <Content Include="Areas\AssetManagementSystem\Views\Ass_UserChangeInfo\Index.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_Warning\Form.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_Warning\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\IndexTeach.js" />
     <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\IndexForLesson.js" />
     <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\IndexForClass.js" />
+    <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\IndexStudent.js" />
     <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\IndexItem.js" />
     <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\SyncByConditionForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\ArrangeLessonSync\Form.js" />
@@ -7481,6 +7483,8 @@
     <Content Include="Areas\EducationalAdministration\Views\ClassPlanTeach\TeachFormQZ.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\IndexForClass.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\IndexForLesson.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\IndexTeach.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\ArrangeExamTermNew\IndexStudent.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js

@@ -154,19 +154,19 @@
             $.ajax({
                 url: $.rootUrl + "/Login/CheckLogin",
                 headers: { __RequestVerificationToken: $.lrToken },
-                data: { username: username, password: password, verifycode: verifycode, up: up },
+                data: { username: username, password: password, verifycode: verifycode, up: up }, AdminDesktop
                 type: "post",
                 dataType: "json",
                 success: function (res) {
                     if (res.code == 200) {
                         if (source == "noLogin") {
-                            window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+                            window.location.href = "/SSOSystem/Index";
                         } else {
                             if (res.data.pwd == true) {
-                                window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwd=true";
+                                window.location.href = "/Home/Index?pwd=true";
                             }
                             else
-                                window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+                                window.location.href = "/Home/Index";
                             //window.location.href = "/Home/Index";
                         }
                     }

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

@@ -195,6 +195,7 @@
     <Compile Include="Modules\ArrangeLessonTermAttemperApi.cs" />
     <Compile Include="Modules\DataSourceNoLoginApi.cs" />
     <Compile Include="Modules\AskApi.cs" />
+    <Compile Include="Modules\EducationalAdministration\ArrangeExamTermApi.cs" />
     <Compile Include="Modules\EducationalAdministration\ArrangeExamTermNewApi.cs" />
     <Compile Include="Modules\EducationalAdministration\LoginUserBindApi.cs" />
     <Compile Include="Modules\PushMessageApi.cs" />

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EducationalAdministration/ArrangeExamTermApi.cs

@@ -0,0 +1,47 @@
+using Learun.Application.Organization;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using Learun.Application.TwoDevelopment.EvaluationTeach;
+using Learun.Util;
+using Nancy;
+using System.Collections.Generic;
+using Learun.Application.TwoDevelopment.Ask;
+
+namespace Learun.Application.WebApi.Modules
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.0 数字化智慧校园
+    /// Copyright (c) 2013-2018 北京泉江科技有限公司
+    /// 创建人：数字化智慧校园-框架开发组
+    /// 日 期：2018.01.04
+    /// 描 述：部门管理
+    /// </summary>
+    public class ArrangeExamTermApi : BaseApi
+    {
+        public ArrangeExamTermApi()
+          : base("/learun/ask")
+        {
+            Get["/teststulist"] = GetSutdentList;
+        }
+
+        private ArrangeExamTermNewIBLL AeTerm = new ArrangeExamTermNewBLL();
+
+        /// <summary>
+        /// 获取学生待考试列表
+        /// </summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response GetSutdentList(dynamic _)
+        {
+            ReqPageParam parameter = this.GetReqData<ReqPageParam>();
+            var data = AeTerm.GetItemPageList(parameter.pagination, parameter.queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = parameter.pagination.total,
+                page = parameter.pagination.page,
+                records = parameter.pagination.records
+            };
+            return Success(jsonData);
+        }
+    }
+}