chenwei
/
lanlingxian_ziranziyuanheguihua
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

项目名称字段修改

dev
陈伟 2025-05-22 16:10:42 +08:00
parent d2f6d271cb
commit f52fc73cbd
5 changed files with 58 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Infrastructure/Utilities/Excel/ExcelExporter.cs
View File

@ -11,8 +11,7 @@ public class ExcelExporter
///
/// </summary>
/// <param name="data"></param>
/// <param name="filePath"></param>
/// <typeparam name="T"></typeparam>
/// <param name="headerTitle"></param>
/// <exception cref="ArgumentException"></exception>
public static Response<MemoryStream> ExportToExcel<T>(IEnumerable<T> data, string headerTitle) where T : class
{
@ -94,7 +93,6 @@ public class ExcelExporter
style.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
style.VerticalAlignment = VerticalAlignment.Center;
}
cell.CellStyle = style;
}

4
Infrastructure/Utilities/Excel/ExcelHeaderStyleAttribute.cs
View File

@ -15,10 +15,6 @@ public class ExcelHeaderStyleAttribute : Attribute
public HorizontalAlignment HorizontalAlignment { get; set; } // 注意：这里的HorizontalAlignment需要自定义或引用相关枚举
// 构造函数，用于初始化特性
public ExcelHeaderStyleAttribute(string fontName, float fontSize, string fontColor, bool bold, bool italic,
HorizontalAlignment horizontalAlignment)

34
OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyApp.cs
View File

@ -79,13 +79,13 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
/// <param name="req"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
public PageInfo<List<DroneSsnyd>> HistoryProject(DroneSnnyAppPageReq req)
public PageInfo<List<DroneSsnyd>> HistoryProject(DroneSsnyAppPageReq req)
{
var totalCount = 0;
var list = Repository.AsQueryable()
.Where(a => a.handle_status_id == 99)
.WhereIF(!string.IsNullOrEmpty(req.xiangmu_no), a => a.xiangmu_no.Contains(req.xiangmu_no))
.WhereIF(!string.IsNullOrEmpty(req.xiangmumc), a => a.xiangmumc.Contains(req.xiangmumc))
.WhereIF(!string.IsNullOrEmpty(req.xiangmu_name), a => a.xiangmu_name.Contains(req.xiangmu_name))
.OrderBy(a => a.end_time, OrderByType.Desc)
.ToPageList(req.page, req.limit, ref totalCount);
return new PageInfo<List<DroneSsnyd>>
@ -100,13 +100,13 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
public PageInfo<List<DroneSsnyd>> ProjectChange(DroneSnnyAppPageReq req)
public PageInfo<List<DroneSsnyd>> ProjectChange(DroneSsnyAppPageReq req)
{
var totalCount = 0;
var list = Repository.AsQueryable()
.Where(a => a.handle_status_id != 99)
.WhereIF(!string.IsNullOrEmpty(req.xiangmu_no), a => a.xiangmu_no.Contains(req.xiangmu_no))
.WhereIF(!string.IsNullOrEmpty(req.xiangmumc), a => a.xiangmumc.Contains(req.xiangmumc))
.WhereIF(!string.IsNullOrEmpty(req.xiangmu_name), a => a.xiangmu_name.Contains(req.xiangmu_name))
.OrderBy(a => a.end_time, OrderByType.Desc)
.ToPageList(req.page, req.limit, ref totalCount);
return new PageInfo<List<DroneSsnyd>>
@ -121,7 +121,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
var list = Repository.AsQueryable()
.Where(a => a.handle_status_id == 99)
.WhereIF(!string.IsNullOrEmpty(req.xiangmu_no), a => a.xiangmu_no.Contains(req.xiangmu_no))
.WhereIF(!string.IsNullOrEmpty(req.xiangmumc), a => a.xiangmumc.Contains(req.xiangmumc))
.WhereIF(!string.IsNullOrEmpty(req.xiangmumc), a => a.xiangmu_name.Contains(req.xiangmumc))
.Select(
a => new DroneSsnydExport()
{
@ -150,7 +150,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
var list = Repository.AsQueryable()
.Where(a => a.handle_status_id != 99)
.WhereIF(!string.IsNullOrEmpty(req.xiangmu_no), a => a.xiangmu_no.Contains(req.xiangmu_no))
.WhereIF(!string.IsNullOrEmpty(req.xiangmumc), a => a.xiangmumc.Contains(req.xiangmumc))
.WhereIF(!string.IsNullOrEmpty(req.xiangmumc), a => a.xiangmu_name.Contains(req.xiangmumc))
.Select(
a => new DroneSsnydExport()
{
@ -400,5 +400,27 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
}
#endregion
/// <summary>
/// 项目编号维护
/// </summary>
/// <param name="id"></param>
/// <param name="newXiangmuNo"></param>
public async Task MaintainNumber(string id, string newXiangmuNo)
{
var project = await Repository.AsQueryable().SingleAsync(a => a.Id == id && a.handle_status_id != 99);
if (project == null)
{
throw new Exception("项目不存在或停止生产");
}
var newProject = new DroneSsnyd()
{
Id = project.Id,
xiangmu_no = newXiangmuNo
};
// todo 空字段是否会影响
await Repository.UpdateAsync(newProject);
}
}
}

4
OpenAuth.App/ServiceApp/DroneSsnydManage/Request/DroneSnnyAppPageReq.cs → OpenAuth.App/ServiceApp/DroneSsnydManage/Request/DroneSsnyAppPageReq.cs
View File

@ -2,12 +2,12 @@
namespace OpenAuth.App.ServiceApp.DroneSsnydManage.Request;
public class DroneSnnyAppPageReq : PageReq
public class DroneSsnyAppPageReq : PageReq
{
/// <summary>
/// 项目名称
/// </summary>
public string xiangmumc { get; set; }
public string xiangmu_name { get; set; }
/// <summary>
/// 项目编号
/// </summary>

30
OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyController.cs
View File

@ -82,7 +82,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
/// <param name="req"></param>
/// <returns></returns>
[HttpGet]
public Response<PageInfo<List<DroneSsnyd>>> HistoryProject(DroneSnnyAppPageReq req)
public Response<PageInfo<List<DroneSsnyd>>> HistoryProject([FromQuery] DroneSsnyAppPageReq req)
{
var response = new Response<PageInfo<List<DroneSsnyd>>>();
try
@ -104,7 +104,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
/// <param name="req"></param>
/// <returns></returns>
[HttpGet]
public Response<PageInfo<List<DroneSsnyd>>> ProjectChange(DroneSnnyAppPageReq req)
public Response<PageInfo<List<DroneSsnyd>>> ProjectChange([FromQuery] DroneSsnyAppPageReq req)
{
var response = new Response<PageInfo<List<DroneSsnyd>>>();
try
@ -119,7 +119,31 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
return response;
}
// todo 项目列表
// todo 编号维护 名称维护 项目续期 项目详情 停止生产 项目称交
/// <summary>
/// 编号维护
/// </summary>
/// <param name="id"></param>
/// <param name="newXiangmuNo"></param>
/// <returns></returns>
[HttpPost]
public async Task<Response<bool>> MaintainNumber(string id, string newXiangmuNo)
{
var response = new Response<bool>();
try
{
await droneSsnyApp.MaintainNumber(id, newXiangmuNo);
response.Result = true;
}
catch (Exception ex)
{
response.Code = 500;
response.Message = ex.InnerException?.Message ?? ex.Message;
}
return response;
}
/// <summary>
/// 历史项目导出