docprint/DocprintService
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新大小写
build / build-push (push) Successful in 28s
Details

Browse Source
This commit is contained in:
wanghu
2026-09-08 17:29:56 +08:00
parent 10c791d034
commit 5785a2c10e
8 changed files with 22 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/YhCore.Common/YhCore.Common.csproj
+1 -1
View File
@@ -17,7 +17,7 @@
<ItemGroup> <ItemGroup>
<!-- 平台模型与信封（DException/ErrorCode/BoaUser 等）：从 Nexus nuget-group 引用（原为本地源项目引用） --> <!-- 平台模型与信封（DException/ErrorCode/BoaUser 等）：从 Nexus nuget-group 引用（原为本地源项目引用） -->
<PackageReference Include="Yh.Platform.Abstractions" Version="1.0.0-preview.1" /> <PackageReference Include="Yh.Platform.Abstractions" Version="1.0.0-preview.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>
src/YhCore.Model/Dto/DictionaryDtos.cs
+1 -13
View File
@@ -68,22 +68,10 @@ namespace YhCore.Model.Dto
/// <summary>全部字典类别（typeID, typeName），对齐旧 EnumConfig.Dictionary 的 Description。</summary> /// <summary>全部字典类别（typeID, typeName），对齐旧 EnumConfig.Dictionary 的 Description。</summary>
public static readonly (string Id, string Name)[] AllTypes = public static readonly (string Id, string Name)[] AllTypes =
{ {
("DEPT", "部门类别"),
("BXBM", "报修部门"),
("WYFL", "文印分类"), ("WYFL", "文印分类"),
("YZBM", "印制版面"), ("YZBM", "印制版面"),
("YZFL", "印制分类"), ("YZFL", "印制分类"),
("LeaveType", "请假类别"), ("filetype", "文件类型")
("FoodType", "物品类别"),
("Unit", "单位"),
("VenueType", "场馆类别"),
("Vefacilities", "场馆设施"),
("Time", "场馆时间"),
("Repeat", "场馆重复"),
("LevelOrder", "奖次"),
("filetype", "文件类型"),
("doclevel", "公文级别"),
("XKCategory", "选课类型"),
}; };
/// <summary>GetSysDic 的 Type(int) → typeID；越界返回 null。</summary> /// <summary>GetSysDic 的 Type(int) → typeID；越界返回 null。</summary>
src/YhCore.Service/Impl/WYSHRoleService.cs
+3 -5
View File
@@ -400,7 +400,7 @@ namespace YhCore.Service.Impl
#region 审核角色流程 #region 审核角色流程
public async Task<PageVO<SHRoleFlowListItem>> ListFlowAsync(string name, int pageSize, int pageIndex, string schSerId, int flowType, bool edit) public async Task<List<SHRoleFlowListItem>> ListFlowAsync(string name, int pageSize, int pageIndex, string schSerId, int flowType, bool edit)
{ {
var resultList = (await _flowinfo.FindAsync(m => m.flowType == flowType && m.schSerID == schSerId)).ToList(); var resultList = (await _flowinfo.FindAsync(m => m.flowType == flowType && m.schSerID == schSerId)).ToList();
@@ -422,8 +422,8 @@ namespace YhCore.Service.Impl
if (!string.IsNullOrEmpty(name)) if (!string.IsNullOrEmpty(name))
resultList = resultList.Where(m => m.flowname != null && m.flowname.IndexOf(name) >= 0).ToList(); resultList = resultList.Where(m => m.flowname != null && m.flowname.IndexOf(name) >= 0).ToList();
var ordered = resultList.OrderBy(m => m.SerID).ToList(); // 旧 ListFlow 的 Data 是纯数组（字段 SerID/flowname/deptid/typeid/enable/enablename/miaoshu/deitdate/ChaoSend/StepSend/WYPageGG 原样大小写），无总数包装
var items = ordered.Skip(pageSize * pageIndex).Take(pageSize) return resultList.OrderBy(m => m.SerID).Skip(pageSize * pageIndex).Take(pageSize)
.Select(item => new SHRoleFlowListItem .Select(item => new SHRoleFlowListItem
{ {
SerID = item.SerID.ToString(), SerID = item.SerID.ToString(),
@@ -439,8 +439,6 @@ namespace YhCore.Service.Impl
WYPageGG = item.WYPageGG, WYPageGG = item.WYPageGG,
}) })
.ToList(); .ToList();
return PageVO<SHRoleFlowListItem>.Of(items, ordered.Count, pageIndex, pageSize);
} }
public async Task<string> EditFlowAsync(Common_flowinfo model) public async Task<string> EditFlowAsync(Common_flowinfo model)
src/YhCore.Service/Interfaces/IWYSHRoleService.cs
+2 -1
View File
@@ -31,7 +31,8 @@ namespace YhCore.Service.Interfaces
Task<string> DelSHRoleAsync(string schSerId, List<decimal?> listSHRoleId); Task<string> DelSHRoleAsync(string schSerId, List<decimal?> listSHRoleId);
// ---- 审核角色流程 ---- // ---- 审核角色流程 ----
Task<PageVO<SHRoleFlowListItem>> ListFlowAsync(string name, int pageSize, int pageIndex, string schSerId, int flowType, bool edit); /// <summary>旧 ListFlow 的 Data 为纯数组（非分页对象），此处保持裸 List 对齐旧 data 内容。</summary>
Task<List<SHRoleFlowListItem>> ListFlowAsync(string name, int pageSize, int pageIndex, string schSerId, int flowType, bool edit);
Task<string> EditFlowAsync(Common_flowinfo model); Task<string> EditFlowAsync(Common_flowinfo model);
Task<string> StepCreateOfSHRoleAsync(Common_flowstep model); Task<string> StepCreateOfSHRoleAsync(Common_flowstep model);
Task<SHRoleStepInfo> GetStepInfoAsync(string schSerId, decimal flowid); Task<SHRoleStepInfo> GetStepInfoAsync(string schSerId, decimal flowid);
src/YhCore.Service/YhCore.Service.csproj
+2 -2
View File
@@ -22,9 +22,9 @@
<ItemGroup> <ItemGroup>
<!-- 业务异常 DException / ErrorCode / IErrorCode：从 Nexus nuget-group 引用（原为本地源项目引用） --> <!-- 业务异常 DException / ErrorCode / IErrorCode：从 Nexus nuget-group 引用（原为本地源项目引用） -->
<PackageReference Include="Yh.Platform.Abstractions" Version="1.0.0-preview.1" /> <PackageReference Include="Yh.Platform.Abstractions" Version="1.0.0-preview.2" />
<!-- 教务（SchClass）开放接口 SDK：教师/学校查询（C1 reviewprocess 教师类接口）：从 Nexus nuget-group 引用（原为本地源项目引用） --> <!-- 教务（SchClass）开放接口 SDK：教师/学校查询（C1 reviewprocess 教师类接口）：从 Nexus nuget-group 引用（原为本地源项目引用） -->
<PackageReference Include="Yh.SchClass.OpenApi" Version="1.0.0-preview.1" /> <PackageReference Include="Yh.SchClass.OpenApi" Version="1.0.0-preview.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>
src/YhCore.WebApi/Controllers/Api/Common/CommonController.cs
+6 -6
View File
@@ -8,6 +8,7 @@ using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Yh.Platform.Abstractions; using Yh.Platform.Abstractions;
using Yh.SchClass.OpenApi; using Yh.SchClass.OpenApi;
using Yh.SchClass.OpenApi.Model;
using YhCore.Common; using YhCore.Common;
using YhCore.Common.Config; using YhCore.Common.Config;
using YhCore.Common.UserContext; using YhCore.Common.UserContext;
@@ -38,12 +39,11 @@ namespace YhCore.WebApi.Controllers.Api.Common
} }
/// <summary>获取指定字典数据（Type 1~10）。</summary> [HttpGet("GetSchoolAll")]
//[HttpGet("GetSchoolAll")] public async Task<List<TeaTreeVo>> GetSchoolAll([FromQuery] int type = 0)
//public async Task<List<DicOption>> GetSchoolAll([FromQuery] int type = 0) {
//{ return await _sch.SchTree.GetTeaTreeAsync(SchSerID(), null);
// return await _sch.S.GetSchTeaInfoAsync(SchSerID(), null); }
//}
src/YhCore.WebApi/Controllers/Api/DocPrint/WYSHRoleController.cs
+2 -2
View File
@@ -118,9 +118,9 @@ namespace YhCore.WebApi.Controllers.Api.DocPrint
#region 审核角色流程 #region 审核角色流程
/// <summary>审核流程列表（旧 ListFlow）。</summary> /// <summary>审核流程列表（旧 ListFlow；data 与旧 Data 一致为纯数组，字段大小写原样）。</summary>
[HttpGet("ListFlow")] [HttpGet("ListFlow")]
public async Task<PageVO<SHRoleFlowListItem>> ListFlow( public async Task<List<SHRoleFlowListItem>> ListFlow(
[FromQuery] string name = null, [FromQuery] string name = null,
[FromQuery] int pageSize = 10, [FromQuery] int pageSize = 10,
[FromQuery] int pageIndex = 0, [FromQuery] int pageIndex = 0,
src/YhCore.WebApi/YhCore.WebApi.csproj
+5 -5
View File
@@ -36,11 +36,11 @@
<ItemGroup> <ItemGroup>
<!-- 平台基础（Abstractions/AppAuth/Auth/OpenApi + 教务 SDK）：从 Nexus nuget-group 引用（原为本地源项目引用） --> <!-- 平台基础（Abstractions/AppAuth/Auth/OpenApi + 教务 SDK）：从 Nexus nuget-group 引用（原为本地源项目引用） -->
<PackageReference Include="Yh.Platform.Abstractions" Version="1.0.0-preview.1" /> <PackageReference Include="Yh.Platform.Abstractions" Version="1.0.0-preview.2" />
<PackageReference Include="Yh.Platform.AppAuth" Version="1.0.0-preview.1" /> <PackageReference Include="Yh.Platform.AppAuth" Version="1.0.0-preview.2" />
<PackageReference Include="Yh.Platform.Auth" Version="1.0.0-preview.1" /> <PackageReference Include="Yh.Platform.Auth" Version="1.0.0-preview.2" />
<PackageReference Include="Yh.Platform.OpenApi" Version="1.0.0-preview.1" /> <PackageReference Include="Yh.Platform.OpenApi" Version="1.0.0-preview.2" />
<PackageReference Include="Yh.SchClass.OpenApi" Version="1.0.0-preview.1" /> <PackageReference Include="Yh.SchClass.OpenApi" Version="1.0.0-preview.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>