diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.js
index 74ea506a5..cfc21c109 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ListContentIndex.js
@@ -11,9 +11,10 @@ var bootstrap = function ($, learun) {
var page = {
init: function () {
+ $('#F_NewsImage').lrUploader({ isUpload:false});
$('.warpper').lrscroll();
var item = top['dtlist' + id];
- if (!!item) {
+ if(false){// (!!item) {
$("#F_FullHead").text(item.f_title);
$("#F_CreateDate").text(item.f_createdate);
$("#F_CreateUserName").text(item.f_createusername);
@@ -26,6 +27,7 @@ var bootstrap = function ($, learun) {
$("#F_CreateUserName").text(data.F_CreateUserName);
$("#F_Category").text(data.F_Category);
$("#F_NewsContent").html($('
').html(data.F_NewsContent));
+ $('#F_NewsImage').lrUploaderSet(data.F_NewsImage);
});
}
//阅读
@@ -43,6 +45,8 @@ var bootstrap = function ($, learun) {
$('#readlist').html(html);
}
});
+
+
}
};
page.init();
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs
index 9d1d71ce3..92592e266 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs
@@ -277,6 +277,10 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
//读入库申请记录
var assinfoapp = db.FindEntity
(m => m.AAProcessId == processId);
var assPurchase = db.FindEntity(a => a.PId == assinfoapp.PId);
+ //通知申请人
+ var purchaseApplyEntity = db.FindEntity(a => a.PAId = assPurchase.PAId);
+ purchaseApplyEntity.PIsInStorage = "已入库";
+ db.Update(purchaseApplyEntity);
if (null != assPurchase)
{
assPurchase.PStoregeStatus = 2;
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_PurchaseApply/Ass_PurchaseApplyEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_PurchaseApply/Ass_PurchaseApplyEntity.cs
index 0d5923de6..9418856c5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_PurchaseApply/Ass_PurchaseApplyEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_PurchaseApply/Ass_PurchaseApplyEntity.cs
@@ -84,6 +84,12 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
///
[Column("POPINION")]
public string POpinion { get; set; }
+
+ ///
+ /// 是否入库
+ ///
+ [Column("PISINSTORAGE")]
+ public string PIsInStorage { get; set; }
#endregion
#region 扩展操作
From 4cac520d800c12e87caad4b216dcd10b41db3988 Mon Sep 17 00:00:00 2001
From: dyy <18335927079@163.com>
Date: Tue, 24 Nov 2020 18:09:01 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?=
=?UTF-8?q?=E5=BF=85=E4=BF=AE=E8=AF=BE=E9=80=89=E4=BF=AE=E8=AF=BE=E8=AF=BE?=
=?UTF-8?q?=E8=A1=A8=E5=90=8C=E6=AD=A5=E5=A2=9E=E5=8A=A0=E5=BE=AE=E4=BF=A1?=
=?UTF-8?q?=E6=8E=A8=E9=80=81=E3=80=81=E9=A3=9E=E6=98=9F=E6=8E=A8=E9=80=81?=
=?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ArrangeLessonTermController.cs | 112 ++++++++++++++++--
.../ArrangeLessonTermOfElectiveController.cs | 98 +++++++++++++++
.../Ass_AssetsInfoApplyService.cs | 2 +-
.../EADateArrange/EADateArrangeService.cs | 2 +-
4 files changed, 205 insertions(+), 9 deletions(-)
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs
index d103ac11b..2b643cac9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs
@@ -1,8 +1,17 @@
-using Learun.Application.TwoDevelopment.EducationalAdministration;
+using Learun.Application.Organization;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using Learun.Application.TwoDevelopment.LR_Desktop;
using Learun.Util;
+using Learun.Util.Operat;
+using Microsoft.AspNet.SignalR.Client;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
+using System.Web;
using System.Web.Mvc;
namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
@@ -17,6 +26,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
public class ArrangeLessonTermController : MvcControllerBase
{
private ArrangeLessonTermIBLL arrangeLessonTermIBLL = new ArrangeLessonTermBLL();
+ private Sys_InformationPushIBLL sys_InformationPushIBLL = new Sys_InformationPushBLL();
+ private UserIBLL userIbll = new UserBLL();
+ private WeChatConfigIBLL weChatConfigIbll = new WeChatConfigBLL();
+ private WeChatTempletIBLL weChatTempletIbll = new WeChatTempletBLL();
#region 视图功能
@@ -27,7 +40,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
[HttpGet]
public ActionResult Index()
{
- return View();
+ return View();
}
///
/// 表单页
@@ -36,7 +49,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
[HttpGet]
public ActionResult Form()
{
- return View();
+ return View();
}
///
/// 按条件清空排课数据
@@ -71,7 +84,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
///
[HttpGet]
[AjaxOnly]
- public ActionResult GetList( string queryJson )
+ public ActionResult GetList(string queryJson)
{
var data = arrangeLessonTermIBLL.GetList(queryJson).ToList()
.OrderBy(x => x.AcademicYearNo).ThenBy(x => x.Semester).ThenBy(x => x.DeptNo).ThenBy(x => x.MajorNo).ThenBy(x => x.LessonNo).ThenBy(x => x.TeachClassNo.Replace(x.LessonName, "")).ThenBy(x => x.EmpNo).ThenBy(x => x.ClassroomNo).ThenBy(x => x.LessonDate);
@@ -133,7 +146,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
[HttpPost]
[ValidateAntiForgeryToken]
[AjaxOnly]
- public ActionResult SaveForm(string keyValue,ArrangeLessonTermEntity entity)
+ public ActionResult SaveForm(string keyValue, ArrangeLessonTermEntity entity)
{
arrangeLessonTermIBLL.SaveEntity(keyValue, entity);
return Success("保存成功！");
@@ -148,7 +161,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
[AjaxOnly]
public async Task AsyncArrangeLessonData()
{
- var data =await arrangeLessonTermIBLL.AsyncArrangeLessonData();
+ var data = await arrangeLessonTermIBLL.AsyncArrangeLessonData();
return Success(data);
}
@@ -185,6 +198,34 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
public async Task AsyncArrangeLessonDataByCondition(ArrangeLessonTermEntity entity)
{
var data = await arrangeLessonTermIBLL.AsyncArrangeLessonDataByCondition(entity);
+ if (data)
+ {
+ //读取信息推送管理-课表同步推送（09）的配置
+ var informationPushEntity = sys_InformationPushIBLL.GetEntityByPushItem("09");
+ if (informationPushEntity != null && informationPushEntity.Status == true)
+ {
+ var title = string.Format("{0}学年第{1}学期必修课课表同步", entity.AcademicYearNo, entity.Semester);
+ var needpostuserlist = userIbll.GetAllList().Where(m => m.F_DeleteMark != 1 && m.F_EnabledMark == 1 && m.F_Description == "教师").ToList();
+ //微信推送
+ try
+ {
+ PushWeixin(needpostuserlist, title);
+ }
+ catch (Exception e)
+ {
+ }
+ //飞星推送
+ await Task.Run(async () =>
+ {
+ using (var hubConnection = new HubConnection(ConfigurationManager.AppSettings["CommunicationServeraddress"]))
+ {
+ var hubProxy = hubConnection.CreateHubProxy("SignalRHub");
+ await hubConnection.Start();
+ await hubProxy.Invoke("PushAnnouncement", LoginUserInfo.Get().userId, "课表同步", Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(title)).Length < 20 ? Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(title)) : Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(title)).Substring(0, 20), "synclesson", string.Join(",", needpostuserlist.Select(m => m.F_UserId)), "");
+ }
+ });
+ }
+ }
return Success(data);
}
///
@@ -194,11 +235,68 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
///
[HttpPost]
[AjaxOnly]
- public ActionResult InitAsyncDataByCondition(ArrangeLessonTermEntity entity)
+ public ActionResult InitAsyncDataByCondition(ArrangeLessonTermEntity entity)
{
var data = arrangeLessonTermIBLL.InitAsyncDataByCondition(entity);
return Success(data);
}
+ public void PushWeixin(List needpostuserlist, string title)
+ {
+ var WeChatConfigentity = weChatConfigIbll.GetEnableEntity();
+ string appid = WeChatConfigentity.APPId;
+ string secret = WeChatConfigentity.secret;
+ var wechatemplete = weChatTempletIbll.GetWeChatTemplateEntityByCodeConfigId(WeChatConfigentity.ID, "task");
+ string weixintaskurl = wechatemplete.TUrl;
+ string weixintasktempid = wechatemplete.TempId;
+ var responsejson = Util.HttpMethods.HttpGet("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + appid + "&secret=" + secret);
+
+ OperateLogModel operateLogModel = new OperateLogModel();
+ operateLogModel.title = title;
+ operateLogModel.type = OperationType.Other;
+ operateLogModel.url = "ArrangeLessonTermController";
+ operateLogModel.sourceObjectId = "002";
+ operateLogModel.sourceContentJson = responsejson;
+ OperatorHelper.Instance.WriteOperateLog(operateLogModel);
+
+ foreach (UserEntity userinfo in needpostuserlist)
+ {
+ if (userinfo != null && !string.IsNullOrEmpty(userinfo.OpenIdForWeixin))
+ {
+ //执行推送任务
+ if (!string.IsNullOrEmpty(appid) && !string.IsNullOrEmpty(secret) && !string.IsNullOrEmpty(weixintaskurl) && !string.IsNullOrEmpty(weixintasktempid))
+ {
+ if (!string.IsNullOrEmpty(responsejson))
+ {
+ var weixintokenobj = JsonConvert.DeserializeObject(responsejson);
+ if (string.IsNullOrEmpty(weixintokenobj.errcode))
+ {
+ string access_token = weixintokenobj.access_token;
+ string jsondata = "{\"touser\":\"" + userinfo.OpenIdForWeixin + "\"," +
+ "\"template_id\":\"" + weixintasktempid + "\"," +
+ "\"url\":\"" + weixintaskurl + "\"," +
+ "\"data\":{" +
+ "\"first\": {\"value\":\"您有新的课表同步\",\"color\":\"#173177\"}," +
+ "\"keyword1\":{\"value\":\"课表同步\",\"color\":\"#173177\"}," +
+ "\"keyword2\": {\"value\":\"" + title + "\",\"color\":\"#173177\"}," +
+ "\"keyword3\": {\"value\":\"待查看\",\"color\":\"#173177\"}," +
+ "\"keyword4\": {\"value\":\"您有新的课表同步【" + title + "】\",\"color\":\"#173177\"}" +
+ "}" +
+ "}";
+ string pushresult = Util.HttpMethods.HttpPost("https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + access_token, jsondata);
+
+ operateLogModel.title = title;
+ operateLogModel.type = OperationType.Other;
+ operateLogModel.url = "ArrangeLessonTermController";
+ operateLogModel.sourceObjectId = "002";
+ operateLogModel.sourceContentJson = pushresult;
+ OperatorHelper.Instance.WriteOperateLog(operateLogModel);
+ }
+ }
+ }
+ }
+ }
+ }
+
}
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermOfElectiveController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermOfElectiveController.cs
index bf9e69cd4..074e78dae 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermOfElectiveController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermOfElectiveController.cs
@@ -4,6 +4,15 @@ using Learun.Application.TwoDevelopment.EducationalAdministration;
using System.Web.Mvc;
using System.Collections.Generic;
using System.Threading.Tasks;
+using System;
+using Microsoft.AspNet.SignalR.Client;
+using System.Configuration;
+using System.Web;
+using System.Linq;
+using Learun.Application.Organization;
+using Learun.Util.Operat;
+using Newtonsoft.Json;
+using Learun.Application.TwoDevelopment.LR_Desktop;
namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
{
@@ -17,6 +26,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
public class ArrangeLessonTermOfElectiveController : MvcControllerBase
{
private ArrangeLessonTermOfElectiveIBLL arrangeLessonTermOfElectiveIBLL = new ArrangeLessonTermOfElectiveBLL();
+ private Sys_InformationPushIBLL sys_InformationPushIBLL = new Sys_InformationPushBLL();
+ private UserIBLL userIbll = new UserBLL();
+ private WeChatConfigIBLL weChatConfigIbll = new WeChatConfigBLL();
+ private WeChatTempletIBLL weChatTempletIbll = new WeChatTempletBLL();
#region 视图功能
@@ -165,8 +178,93 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
public async Task AsyncArrangeLessonDataByCondition(ArrangeLessonTermOfElectiveEntity entity)
{
var data = await arrangeLessonTermOfElectiveIBLL.AsyncArrangeLessonDataByCondition(entity);
+ if (data)
+ {
+ //读取信息推送管理-课表同步推送（09）的配置
+ var informationPushEntity = sys_InformationPushIBLL.GetEntityByPushItem("09");
+ if (informationPushEntity != null && informationPushEntity.Status == true)
+ {
+ var title = string.Format("{0}学年第{1}学期选修课课课表同步", entity.AcademicYearNo, entity.Semester);
+ var needpostuserlist = userIbll.GetAllList().Where(m => m.F_DeleteMark != 1 && m.F_EnabledMark == 1 && m.F_Description == "教师").ToList();
+ //微信推送
+ try
+ {
+ PushWeixin(needpostuserlist, title);
+ }
+ catch (Exception e)
+ {
+ }
+ //飞星推送
+ await Task.Run(async () =>
+ {
+ using (var hubConnection = new HubConnection(ConfigurationManager.AppSettings["CommunicationServeraddress"]))
+ {
+ var hubProxy = hubConnection.CreateHubProxy("SignalRHub");
+ await hubConnection.Start();
+ await hubProxy.Invoke("PushAnnouncement", LoginUserInfo.Get().userId, "课表同步", Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(title)).Length < 20 ? Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(title)) : Util.Str.ReplaceHtml(HttpUtility.HtmlDecode(title)).Substring(0, 20), "synclesson", string.Join(",", needpostuserlist.Select(m => m.F_UserId)), "");
+ }
+ });
+ }
+ }
return Success(data);
}
+ public void PushWeixin(List needpostuserlist, string title)
+ {
+ var WeChatConfigentity = weChatConfigIbll.GetEnableEntity();
+ string appid = WeChatConfigentity.APPId;
+ string secret = WeChatConfigentity.secret;
+ var wechatemplete = weChatTempletIbll.GetWeChatTemplateEntityByCodeConfigId(WeChatConfigentity.ID, "task");
+ string weixintaskurl = wechatemplete.TUrl;
+ string weixintasktempid = wechatemplete.TempId;
+ var responsejson = Util.HttpMethods.HttpGet("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + appid + "&secret=" + secret);
+
+ OperateLogModel operateLogModel = new OperateLogModel();
+ operateLogModel.title = title;
+ operateLogModel.type = OperationType.Other;
+ operateLogModel.url = "ArrangeLessonTermOfElectiveController";
+ operateLogModel.sourceObjectId = "002";
+ operateLogModel.sourceContentJson = responsejson;
+ OperatorHelper.Instance.WriteOperateLog(operateLogModel);
+
+ foreach (UserEntity userinfo in needpostuserlist)
+ {
+ if (userinfo != null && !string.IsNullOrEmpty(userinfo.OpenIdForWeixin))
+ {
+ //执行推送任务
+ if (!string.IsNullOrEmpty(appid) && !string.IsNullOrEmpty(secret) && !string.IsNullOrEmpty(weixintaskurl) && !string.IsNullOrEmpty(weixintasktempid))
+ {
+ if (!string.IsNullOrEmpty(responsejson))
+ {
+ var weixintokenobj = JsonConvert.DeserializeObject(responsejson);
+ if (string.IsNullOrEmpty(weixintokenobj.errcode))
+ {
+ string access_token = weixintokenobj.access_token;
+ string jsondata = "{\"touser\":\"" + userinfo.OpenIdForWeixin + "\"," +
+ "\"template_id\":\"" + weixintasktempid + "\"," +
+ "\"url\":\"" + weixintaskurl + "\"," +
+ "\"data\":{" +
+ "\"first\": {\"value\":\"您有新的课表同步\",\"color\":\"#173177\"}," +
+ "\"keyword1\":{\"value\":\"课表同步\",\"color\":\"#173177\"}," +
+ "\"keyword2\": {\"value\":\"" + title + "\",\"color\":\"#173177\"}," +
+ "\"keyword3\": {\"value\":\"待查看\",\"color\":\"#173177\"}," +
+ "\"keyword4\": {\"value\":\"您有新的课表同步【" + title + "】\",\"color\":\"#173177\"}" +
+ "}" +
+ "}";
+ string pushresult = Util.HttpMethods.HttpPost("https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + access_token, jsondata);
+
+ operateLogModel.title = title;
+ operateLogModel.type = OperationType.Other;
+ operateLogModel.url = "ArrangeLessonTermOfElectiveController";
+ operateLogModel.sourceObjectId = "002";
+ operateLogModel.sourceContentJson = pushresult;
+ OperatorHelper.Instance.WriteOperateLog(operateLogModel);
+ }
+ }
+ }
+ }
+ }
+ }
+
#endregion
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs
index 92592e266..7eae4d3b3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs
@@ -278,7 +278,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
var assinfoapp = db.FindEntity(m => m.AAProcessId == processId);
var assPurchase = db.FindEntity(a => a.PId == assinfoapp.PId);
//通知申请人
- var purchaseApplyEntity = db.FindEntity(a => a.PAId = assPurchase.PAId);
+ var purchaseApplyEntity = db.FindEntity(a => a.PAId == assPurchase.PAId);
purchaseApplyEntity.PIsInStorage = "已入库";
db.Update(purchaseApplyEntity);
if (null != assPurchase)
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeService.cs
index b1eae04ab..53e7d68bf 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeService.cs
@@ -187,11 +187,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
var entity = this.BaseRepository("CollegeMIS").FindEntity(keyValue);
if (entity != null)
{
- var needpostuserlist = this.BaseRepository().FindList(m => m.F_DeleteMark != 1 && m.F_EnabledMark == 1 && m.F_Description == "教师").ToList();
//读取信息推送管理-教学工作安排推送（08）的配置
var informationPushEntity = this.BaseRepository().FindEntity(x => x.PushItem == "08");
if (informationPushEntity != null && informationPushEntity.Status == true)
{
+ var needpostuserlist = this.BaseRepository().FindList(m => m.F_DeleteMark != 1 && m.F_EnabledMark == 1 && m.F_Description == "教师").ToList();
//微信推送
try
{
From 6f208cc2c8556d422c2d4801550fd9a08a91649e Mon Sep 17 00:00:00 2001
From: zhichao lei <442149704@qq.com>
Date: Wed, 25 Nov 2020 16:07:40 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89isScrap=20=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Views/Ass_AssetsInfoItem/Index.js | 16 ----------------
.../Views/Ass_AssetsInfoItem/IndexOfMy.js | 16 ----------------
.../Views/Ass_AssetsInfoItem/IndexScrap.js | 16 ----------------
.../AssScrap/AssScrapService.cs | 2 +-
.../Ass_AssetsInfoItemService.cs | 2 +-
5 files changed, 2 insertions(+), 50 deletions(-)
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js
index 0d24bb350..0aaed027e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js
@@ -302,22 +302,6 @@ var bootstrap = function ($, learun) {
}
},
{ label: "资产价值", name: "AIAssValue", width: 100, align: "left" },
- //{
- // label: "是否报废", name: "AIIsScrap", width: 100, align: "left",
- // formatterAsync: function (callback, value, row, op, $cell) {
- // learun.clientdata.getAsync('dataItem', {
- // key: value,
- // code: 'YesOrNoBit',
- // callback: function (_data) {
- // if (_data.text) {
- // callback(_data.text);
- // } else {
- // callback('正常使用');
- // }
- // }
- // });
- // }
- //},
{ label: "购置日期", name: "AIAddTime", width: 100, align: "left" },
{
label: "资产分类", name: "AIASSClass", width: 100, align: "left",
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js
index 3bfbc2535..75f18e3e8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js
@@ -302,22 +302,6 @@ var bootstrap = function ($, learun) {
}
},
{ label: "资产价值", name: "AIAssValue", width: 100, align: "left" },
- //{
- // label: "是否报废", name: "AIIsScrap", width: 100, align: "left",
- // formatterAsync: function (callback, value, row, op, $cell) {
- // learun.clientdata.getAsync('dataItem', {
- // key: value,
- // code: 'YesOrNoBit',
- // callback: function (_data) {
- // if (_data.text) {
- // callback(_data.text);
- // } else {
- // callback('正常使用');
- // }
- // }
- // });
- // }
- //},
{ label: "购置日期", name: "AIAddTime", width: 100, align: "left" },
{
label: "资产分类", name: "AIASSClass", width: 100, align: "left",
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.js
index 1f28c83ab..87c6210bf 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexScrap.js
@@ -267,22 +267,6 @@ var bootstrap = function ($, learun) {
}
},
{ label: "资产价值", name: "AIAssValue", width: 100, align: "left" },
- {
- label: "是否报废", name: "AIIsScrap", width: 100, align: "left",
- formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('dataItem', {
- key: value,
- code: 'YesOrNoBit',
- callback: function (_data) {
- if (_data.text) {
- callback(_data.text);
- } else {
- callback('正常使用');
- }
- }
- });
- }
- },
{ label: "购置日期", name: "AIAddTime", width: 100, align: "left" },
{
label: "资产分类", name: "AIASSClass", width: 100, align: "left",
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/AssScrap/AssScrapService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/AssScrap/AssScrapService.cs
index 3517707c6..a7cffff9c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/AssScrap/AssScrapService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/AssScrap/AssScrapService.cs
@@ -244,7 +244,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
assInfo.AStock = assInfo.AStock - 1;
db.Update(assInfo);
}
- assInfoItem.AIASSState = 2;
+ assInfoItem.AIASSState = 1;
db.Update(assInfoItem);
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemService.cs
index 45039329d..f0fba22c6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoItem/Ass_AssetsInfoItemService.cs
@@ -376,7 +376,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
t.AContent
");
strSql.Append(" FROM Ass_AssetsInfoItem a LEFT JOIN dbo.Ass_AssetsInfo t ON a.AId=t.AId ");
- strSql.Append(" WHERE a.AIIsScrap<>2 ");
+ strSql.Append(" WHERE a.AIASSState <> 2 or t.AIASSState is null ");
// 虚拟参数
var dp = new DynamicParameters(new { });
if (!aiid.IsEmpty())