From e989b7cd42db58c7ee505e35f8f3239f2231589f Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 15 Jul 2022 17:37:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=BA=90=E5=9C=B0=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=20=E5=A4=96=E7=9C=81=E5=9C=B0=E5=B8=82=E5=BF=BD=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StuInfoFreshController.cs | 2 +- .../Views/StuInfoFresh/StatisticsProvince.js | 4 ++-- .../StuInfoFresh/StuInfoFreshService.cs | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs index 13614c3f9..81b4437e2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs @@ -1286,7 +1286,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers public ActionResult GetStatisticProvince(string queryJson) { var data = stuInfoFreshIBLL.GetList2(queryJson); - var list = data.Where(x => !string.IsNullOrEmpty(x.Province) && !string.IsNullOrEmpty(x.City)).GroupBy(x => new { x.Province, x.City }).Select(x => new StatisticModel + var list = data.Where(x => !string.IsNullOrEmpty(x.Province)).GroupBy(x => new { x.Province, x.City }).Select(x => new StatisticModel { Province = x.Key.Province, City = x.Key.City, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticsProvince.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticsProvince.js index d79f2be73..18ef1cb45 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticsProvince.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatisticsProvince.js @@ -35,7 +35,7 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetStatisticProvince', headData: [ { - label: '生源地', name: 'Province', width: 100, align: "left", + label: '省份', name: 'Province', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE', @@ -48,7 +48,7 @@ var bootstrap = function ($, learun) { } }, { - label: '疆内', name: 'City', width: 100, align: "left", + label: '地市', name: 'City', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY', diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs index d2f057ceb..bc5cfd308 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs @@ -206,6 +206,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { item.IsStudentEdit = false; } + + if (item.Province != "650000") + { + item.City = ""; + } } return data;