ccy/mh_sms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms

Browse Source
This commit is contained in:
wyw 2024-05-09 08:46:02 +08:00
commit 5ee219615f
7 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
APT.MicroApi/APT.FO.WebApi/appsettings.json
View File

@ -19,7 +19,7 @@
"ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn",
"ConnDataKey": "MHKSAQ1212010101",
"TenantConnKey": "MHSMS",
"Img_Local": "C:\\release\\img"
"Img_Local": "C:\\sms\\uploadFile"
},
"RedisConfig": {
"RedisConnectionString": "120.25.146.51:6379",

2
APT.MicroApi/APT.PF.WebApi/appsettings.Pdev.json
View File

@ -16,7 +16,7 @@
"TenantConnKey": "PDEV1212",
"RedisFormConfig": "true",
"Env": "1", //外网IP 0：内网IP
"Img_Local": "C:\\release\\img"
"Img_Local": "C:\\sms\\uploadFile"
},
"RedisConfig": {
"RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=15",

2
APT.MicroApi/APT.PF.WebApi/appsettings.Production.json
View File

@ -15,7 +15,7 @@
"ConnDataKey": "MHKSAQ1212010101",
"TenantConnKey": "MHSMS",
"RedisFormConfig": "true",
"Img_Local": "C:\\release\\img"
"Img_Local": "C:\\sms\\uploadFile"
},
"RedisConfig": {
"RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=15",

14
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/1SESafeSurveyController.cs
View File

@ -272,10 +272,6 @@ namespace APT.SC.WebApi.Controllers.Api.SE
{
throw new Exception("未查到有效数据");
}
if (entity.STATUS != SESafeSurveyStatus.汇总审阅中)
{
throw new Exception("当前状态无法完成审阅");
}
entity.STATUS = SESafeSurveyStatus.完成;
var finishNoitice = NotificationTaskService.GetTaskFinishModel(finishId);
UnifiedCommit(() =>
@ -479,8 +475,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
}
}
BaseFilter baseFilter = new BaseFilter(filter.GetOrgId());
baseFilter.Include = new string[] { "Nav_User.Nav_Person.Nav_Post", "Nav_User.Nav_Department.Nav_Parent", "Nav_Department.Nav_Parent", "Nav_Test.Nav_Posts", "Nav_Test.Nav_Points" };
var papers = GetEntities<T_SE_SAFE_SURVEY_LIST_PAPER>(t => surveyIds.Contains(t.SAFE_ID), baseFilter);
IEnumerable<T_SE_SAFE_SURVEY_LIST_PAPER> papers = new List<T_SE_SAFE_SURVEY_LIST_PAPER>();
var colscount = points.Count;
for (int i = 0; i < points.Count; i++)
{
@ -489,6 +484,8 @@ namespace APT.SC.WebApi.Controllers.Api.SE
var MAP = new Dictionary<Guid, int>();
if (ret.TYPE == "人员")
{
baseFilter.SelectField = new string[] { "ANSWER", "Nav_User.NAME", "Nav_Test.Nav_Points.POINT_ID", "Nav_Test.ANSWER" };
papers = GetEntities<T_SE_SAFE_SURVEY_LIST_PAPER>(t => surveyIds.Contains(t.SAFE_ID), baseFilter);
papers.ForEach(paper =>
{
int idx = 0;
@ -515,6 +512,8 @@ namespace APT.SC.WebApi.Controllers.Api.SE
}
else if (ret.TYPE == "岗位")
{
baseFilter.SelectField = new string[] { "ANSWER", "Nav_User.Nav_Person.Nav_Post.NAME", "Nav_Test.Nav_Points.POINT_ID", "Nav_Test.ANSWER" };
papers = GetEntities<T_SE_SAFE_SURVEY_LIST_PAPER>(t => surveyIds.Contains(t.SAFE_ID), baseFilter);
papers.ForEach(paper =>
{
if (paper.Nav_User.Nav_Person.Nav_Post != null)
@ -544,6 +543,9 @@ namespace APT.SC.WebApi.Controllers.Api.SE
}
else if (ret.TYPE == "部门")
{
baseFilter.SelectField = new string[] { "ANSWER", "Nav_User.Nav_Department.NAME", "Nav_Department.NAME", "Nav_Test.Nav_Points.POINT_ID","Nav_Test.ANSWER" };
papers = GetEntities<T_SE_SAFE_SURVEY_LIST_PAPER>(t => surveyIds.Contains(t.SAFE_ID), baseFilter);
papers.ForEach(paper =>
{
int idx = 0;

18
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/2SETrainSurveyController.cs
View File

@ -303,25 +303,17 @@ namespace APT.SC.WebApi.Controllers.Api.SE
GetDepartmentIds(temp, orgId, ref departmentIds);
}
}
/// <summary>
/// 获得单条实体数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Get")]
public JsonActionResult<T_SE_TRAIN_SURVEY> Get([FromBody] KeywordFilter filter)
[HttpPost, Route("OrderPaged")]
public PagedActionResult<T_SE_TRAIN_SURVEY> OrderPaged([FromBody] BasePageFilter filter)
{
filter.Include = new string[] {
"Nav_LaunchDepartment",
"Nav_LaunchUser",
"Nav_Points.Nav_Point",
"Nav_JoinDepartment.Nav_Department",
"Nav_Demands.Nav_User.Nav_Department",
"Nav_Demands.Nav_Department",
"Nav_Demands.Nav_Items.Nav_DEMAND",
};
var result = WitEntity(null, filter);
var result = WitOrderPaged(t=>t.TASK_ID!=null, filter);
return result;
}
}

1
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SEConfigController.cs
View File

@ -8,7 +8,6 @@ using System.Collections.Generic;
using System.Linq;
using APT.Infrastructure.Core;
using APT.BaseData.Domain.ApiModel;
using System.Data;
using System.IO;
using APT.BaseData.Domain.Entities.FM;

18
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SEThreeLevelEduCardController.cs
View File

@ -35,6 +35,20 @@ namespace APT.SC.WebApi.Controllers.Api.SE
{
return SafeExecute<bool>(() =>
{
List<T_SE_THREE_LEVEL_SAFE_TRAIN_RECORD_FILE> files = new List<T_SE_THREE_LEVEL_SAFE_TRAIN_RECORD_FILE>();
var Nav_Record = entity.Nav_TrainRecordList;
Nav_Record.ForEach(t =>
{
if (t.Nav_TrainRecordFile != null && t.Nav_TrainRecordFile.Count() > 0)
{
t.Nav_TrainRecordFile.ForEach(nf =>
{
nf.TRAIN_RECORD_ID = t.ID;
});
files.AddRange(t.Nav_TrainRecordFile);
t.Nav_TrainRecordFile = null;
}
});
var currUser = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
if (string.IsNullOrEmpty(entity.ID_CARD_NUMBER))
{
@ -90,6 +104,10 @@ namespace APT.SC.WebApi.Controllers.Api.SE
UnifiedCommit(() =>
{
UpdateEntityNoCommit(entity);
if (Nav_Record != null)
BantchSaveEntityNoCommit(Nav_Record);
if (files.Any())
BantchSaveEntityNoCommit(files);
if (next_train_record != null)
AddEntityNoCommit(next_train_record);
if (sendNotice != null)