|
@@ -36,6 +36,7 @@ using XF.Domain.Cache;
|
|
|
using XF.Domain.Exceptions;
|
|
|
using XF.Domain.Repository;
|
|
|
using XF.Utility.EnumExtensions;
|
|
|
+using Hotline.Tools;
|
|
|
|
|
|
namespace Hotline.Api.Controllers
|
|
|
{
|
|
@@ -310,8 +311,8 @@ namespace Hotline.Api.Controllers
|
|
|
/// <param name="dto"></param>
|
|
|
/// <returns></returns>
|
|
|
[HttpPost("dictdata-type/export")]
|
|
|
- [LogFilterAlpha("导出日志")]
|
|
|
- public async Task<FileStreamResult> GetSysDicDataExport([FromBody]ExportExcelDto<GetSysDicDataDto> dto)
|
|
|
+ [LogFilterAlpha("导出日志")]
|
|
|
+ public async Task<FileStreamResult> GetSysDicDataExport([FromBody] ExportExcelDto<GetSysDicDataDto> dto)
|
|
|
{
|
|
|
var items = await _sysDicDataRepository.Queryable().Where(x => x.DicTypeId == dto.QueryDto.typeid).OrderBy(x => x.Sort).ToTreeAsync(x => x.Children, x => x.ParentId, "");
|
|
|
return _exportApplication.GetExcelFile(dto, items, "字典列表");
|
|
@@ -394,7 +395,7 @@ namespace Hotline.Api.Controllers
|
|
|
if (dicData is null)
|
|
|
throw UserFriendlyException.SameMessage("无效字典数据");
|
|
|
var chail = await _sysDicDataRepository.AnyAsync(p => p.ParentId == id, HttpContext.RequestAborted);
|
|
|
- if(chail==true)
|
|
|
+ if (chail == true)
|
|
|
throw UserFriendlyException.SameMessage("存在下级数据,请先删除下级数据!");
|
|
|
|
|
|
var dicType = await _sysDicTypeRepository.GetAsync(dicData.DicTypeId, HttpContext.RequestAborted);
|
|
@@ -417,23 +418,23 @@ namespace Hotline.Api.Controllers
|
|
|
return await _systemAreaDomainService.GetAreaTree(_appOptions.Value.IsZiGong ? 6 : 0);
|
|
|
}
|
|
|
|
|
|
- /// <summary>
|
|
|
- /// 获取省市区树形 来电弹单界面获取
|
|
|
- /// </summary>
|
|
|
- /// <returns></returns>
|
|
|
- [HttpGet("area/tree_accepted")]
|
|
|
- public async Task<List<SystemArea>> GetAreaTree_Accepted()
|
|
|
- {
|
|
|
- return await _systemAreaDomainService.GetAreaTree(_appOptions.Value.IsZiGong ? 6 : 0, _appOptions.Value.IsLuZhou ? "510500" : "510000");
|
|
|
- }
|
|
|
-
|
|
|
- /// <summary>
|
|
|
- /// 获取省市区树形
|
|
|
- /// </summary>
|
|
|
- /// <returns></returns>
|
|
|
- [HttpPost("area/tree/export")]
|
|
|
- [LogFilterAlpha("导出日志")]
|
|
|
- public async Task<FileStreamResult> GetAreaTreeExport([FromBody]ExportExcelDto<string> dto)
|
|
|
+ /// <summary>
|
|
|
+ /// 获取省市区树形 来电弹单界面获取
|
|
|
+ /// </summary>
|
|
|
+ /// <returns></returns>
|
|
|
+ [HttpGet("area/tree_accepted")]
|
|
|
+ public async Task<List<SystemArea>> GetAreaTree_Accepted()
|
|
|
+ {
|
|
|
+ return await _systemAreaDomainService.GetAreaTree(_appOptions.Value.IsZiGong ? 6 : 0, _appOptions.Value.IsLuZhou ? "510500" : "510000");
|
|
|
+ }
|
|
|
+
|
|
|
+ /// <summary>
|
|
|
+ /// 获取省市区树形
|
|
|
+ /// </summary>
|
|
|
+ /// <returns></returns>
|
|
|
+ [HttpPost("area/tree/export")]
|
|
|
+ [LogFilterAlpha("导出日志")]
|
|
|
+ public async Task<FileStreamResult> GetAreaTreeExport([FromBody] ExportExcelDto<string> dto)
|
|
|
{
|
|
|
var items = await _systemAreaDomainService.GetAreaTree(_appOptions.Value.IsZiGong ? 6 : 0);
|
|
|
return _exportApplication.GetExcelFile(dto, items, "行政区域");
|
|
@@ -537,6 +538,7 @@ namespace Hotline.Api.Controllers
|
|
|
#endregion
|
|
|
|
|
|
#region 常用意见
|
|
|
+
|
|
|
#region 个人
|
|
|
/// <summary>
|
|
|
/// 获取常用意见
|
|
@@ -591,6 +593,7 @@ namespace Hotline.Api.Controllers
|
|
|
#endregion
|
|
|
|
|
|
#region 公开
|
|
|
+
|
|
|
/// <summary>
|
|
|
/// 查询公开常用意见
|
|
|
/// </summary>
|
|
@@ -606,6 +609,41 @@ namespace Hotline.Api.Controllers
|
|
|
return new PagedDto<SystemCommonOpinion>(total, items);
|
|
|
}
|
|
|
|
|
|
+ /// <summary>export
|
|
|
+ /// 查询公开常用意见导出
|
|
|
+ /// </summary>
|
|
|
+ /// <param name="dto"></param>
|
|
|
+ /// <returns></returns>
|
|
|
+ [HttpPost("open-common/export")]
|
|
|
+ [LogFilterAlpha("导出日志")]
|
|
|
+ public async Task<FileStreamResult> QueryOpenCommonOpinionExport([FromBody] ExportExcelDto<QueryCommonDto> dto)
|
|
|
+ {
|
|
|
+ var query = _commonOpinionRepository.Queryable()
|
|
|
+ .WhereIF(dto.QueryDto.IsOpen != null, x => x.IsOpen == dto.QueryDto.IsOpen)
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(dto.QueryDto.UserName), x => x.CreatorName.Contains(dto.QueryDto.UserName))
|
|
|
+ .WhereIF(dto.QueryDto.CommonType != null, x => x.CommonType == dto.QueryDto.CommonType);
|
|
|
+
|
|
|
+ var total = 0;
|
|
|
+ var items = new List<SystemCommonOpinion>();
|
|
|
+ if (dto.IsExportAll)
|
|
|
+ {
|
|
|
+ items = await query.ToListAsync(HttpContext.RequestAborted);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ (total, items) = await query.ToPagedListAsync(dto.QueryDto.PageIndex, dto.QueryDto.PageSize, HttpContext.RequestAborted);
|
|
|
+ }
|
|
|
+
|
|
|
+ dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass<SystemCommonOpinion>(dto.ColumnInfos);
|
|
|
+
|
|
|
+ var dtos = _mapper.Map<ICollection<SystemCommonOpinion>>(items)
|
|
|
+ .Select(stu => _mapper.Map(stu, typeof(SystemCommonOpinion), dynamicClass))
|
|
|
+ .Cast<object>()
|
|
|
+ .ToList();
|
|
|
+
|
|
|
+ var stream = ExcelHelper.CreateStream(dtos);
|
|
|
+ return ExcelStreamResult(stream, "常用意见管理");
|
|
|
+ }
|
|
|
|
|
|
/// <summary>
|
|
|
/// 修改公开常用意见
|