src/Hotline.Api/Controllers/JudicialManagementOrdersController.cs

@@ -38,20 +38,20 @@ namespace Hotline.Api.Controllers
         private readonly IJudicialManagementOrdersService _judicialManagementOrdersService;
         private readonly IRepository<EnforcementOrdersHandler> _enforcementOrdersHandlerRepository;
 
-       /// <summary>
-       /// 
-       /// </summary>
-       /// <param name="judicialComplaintsEventTypeRepository"></param>
-       /// <param name="enforcementHotspotRepository"></param>
-       /// <param name="mapper"></param>
-       /// <param name="sysDicDataCacheManager"></param>
-       /// <param name="systemOrganizeRepository"></param>
-       /// <param name="sessionContext"></param>
-       /// <param name="systemAreaRepository"></param>
-       /// <param name="judicialManagementOrdersRepository"></param>
-       /// <param name="fileRepository"></param>
-       /// <param name="judicialManagementOrdersService"></param>
-       /// <param name="enforcementOrdersHandlerRepository"></param>
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="judicialComplaintsEventTypeRepository"></param>
+        /// <param name="enforcementHotspotRepository"></param>
+        /// <param name="mapper"></param>
+        /// <param name="sysDicDataCacheManager"></param>
+        /// <param name="systemOrganizeRepository"></param>
+        /// <param name="sessionContext"></param>
+        /// <param name="systemAreaRepository"></param>
+        /// <param name="judicialManagementOrdersRepository"></param>
+        /// <param name="fileRepository"></param>
+        /// <param name="judicialManagementOrdersService"></param>
+        /// <param name="enforcementOrdersHandlerRepository"></param>
         public JudicialManagementOrdersController(
          IRepository<JudicialComplaintsEventType> judicialComplaintsEventTypeRepository,
          IRepository<EnforcementHotspot> enforcementHotspotRepository,
@@ -90,8 +90,6 @@ namespace Hotline.Api.Controllers
         {
             dto.InitAddress();
             var order = _mapper.Map<JudicialManagementOrders>(dto);
-            order.SignerId = _sessionContext.UserId;
-            order.SignerName = _sessionContext.UserName;
             order.InitId();
             if (dto.Files.Any())
                 order.FileJson = await _fileRepository.AddFileAsync(dto.Files, order.Id, "", HttpContext.RequestAborted);
@@ -108,11 +106,11 @@ namespace Hotline.Api.Controllers
                         OrderNo = order.No,
                         OrderSoure = EOrderSoure.Enforcement,
                         OrgCode = item.Value,
-                        OrgName = item.Value
+                        OrgName = item.Key
                     });
-                    if (enforcementOrdersHandlers != null && enforcementOrdersHandlers.Any())
-                        await _enforcementOrdersHandlerRepository.AddRangeAsync(enforcementOrdersHandlers, HttpContext.RequestAborted);
                 }
+                if (enforcementOrdersHandlers != null && enforcementOrdersHandlers.Any())
+                    await _enforcementOrdersHandlerRepository.AddRangeAsync(enforcementOrdersHandlers, HttpContext.RequestAborted);
             }
             return order.Id;
         }
@@ -148,7 +146,7 @@ namespace Hotline.Api.Controllers
                         OrderNo = order.No,
                         OrderSoure = EOrderSoure.Enforcement,
                         OrgCode = item.Value,
-                        OrgName = item.Value
+                        OrgName = item.Key
                     });
                     if (enforcementOrdersHandlers != null && enforcementOrdersHandlers.Any())
                     {

src/Hotline.Api/config/appsettings.Development.json

@@ -37,7 +37,7 @@
     "Host": "110.188.24.182",
     "Port": 50179,
     "Password": "fengwo123!$!$",
-    "Database": 3 //release:3, dev:5
+    "Database": 5 //release:3, dev:5
   },
   "Swagger": true,
   "Cors": {

src/Hotline.Share/Dtos/JudicialManagement/JudicialManagementAddOrderDto.cs

@@ -1,13 +1,96 @@
 using Hotline.Share.Dtos.File;
-using Hotline.Share.Dtos.Order;
+using Hotline.Share.Enums.JudicialManagement;
+using Hotline.Share.Enums.Order;
 
 namespace Hotline.Share.Dtos.JudicialManagement
 {
     /// <summary>
     /// 修改
     /// </summary>
-    public class JudicialManagementAddOrderDto : AddOrderDto
+    public class JudicialManagementAddOrderDto: Position
     {
+        /// <summary>
+        /// 来源渠道（电话、网站、APP等）
+        /// </summary>
+        public string? SourceChannel { get; set; }
+
+        public string? SourceChannelCode { get; set; }
+
+        /// <summary>
+        /// 来电号码
+        /// </summary>
+        public string? FromPhone { get; set; }
+
+        /// <summary>
+        /// 转接号码（转接来源）
+        /// </summary>
+        public string? TransferPhone { get; set; }
+
+        /// <summary>
+        /// 来电/信人姓名
+        /// </summary>
+        public string? FromName { get; set; }
+
+        /// <summary>
+        /// 来电/信人性别
+        /// </summary>
+        public EGender FromGender { get; set; }
+
+        /// <summary>
+        /// 来电/信人身份
+        /// </summary>
+        public EIdentityType? IdentityType { get; set; }
+
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        public string? Contact { get; set; }
+
+        public string? ContactMask { get; set; }
+
+        /// <summary>
+        /// 受理类型
+        /// </summary>
+        public string? AcceptType { get; set; }
+
+        public string? AcceptTypeCode { get; set; }
+
+        public string Title { get; set; }
+
+        /// <summary>
+        /// 热点
+        /// </summary>
+        public string? HotspotId { get; set; }
+
+        public string? HotspotName { get; set; }
+
+        public string? HotspotSpliceName { get; set; }
+
+        /// <summary>
+        /// 外部数据（为前端提供级联功能）
+        /// </summary>
+        public string? HotspotExternal { get; set; }
+
+        /// <summary>
+        /// 附件列表
+        /// </summary>
+        public List<FileDto> Files { get; set; } = new();
+
+        /// <summary>
+        /// 诉求内容
+        /// </summary>
+        public string Content { get; set; }
+
+        /// <summary>
+        /// 工单来源
+        /// </summary>
+        public EOrderSoure? OrderSoure { get; set; }
+
+        /// <summary>
+        /// 是否行政执法类
+        /// </summary>
+        public bool? IsEnforcementOrder { get; set; }
+
         /// <summary>
         /// 执法部门
         /// </summary>
@@ -22,18 +105,76 @@ namespace Hotline.Share.Dtos.JudicialManagement
         public string Id { get; set; }
     }
 
-    public class JudicialManagementOrderDto: JudicialManagementUpdateOrderDto
+    public class JudicialManagementOrderDto : JudicialManagementUpdateOrderDto
     {
         /// <summary>
-        /// 工单编码（20220101000001）
+        /// 是否推诿
         /// </summary>
-        public string No { get; set; }
+        public bool IsPassTheBuckOrder { get; set; }
 
+        /// <summary>
+        /// 线索是否属实
+        /// </summary>
+        public bool? IsTheClueTrue { get; set; }
+
+        /// <summary>
+        /// 诉事项类型ID
+        /// </summary>
+        public string? EventTypeId { get; set; }
+
+        /// <summary>
+        /// 诉事项类型名称
+        /// </summary>
+        public string? EventTypeName { get; set; }
+
+        /// <summary>
+        /// 诉事项类型名称
+        /// </summary>
+        public string? EventTypeSpliceName { get; set; }
+
+        /// <summary>
+        /// 诉事项类型一级Id
+        /// </summary>
+        public string? EventTypeOneLevelId { get; set; }
+
+        /// <summary>
+        /// 同步省工单编号和省上传下来的工单都用这个字段
+        /// </summary>
+        public string? ProvinceNo { get; set; }
         /// <summary>
         /// 市民查询密码
         /// </summary>
         public string? Password { get; set; }
 
+        /// <summary>
+        /// 受理人id
+        /// </summary>
+        public string? AcceptorId { get; set; }
+
+        /// <summary>
+        /// 受理人名称
+        /// </summary>
+        public string? AcceptorName { get; set; }
+
+        /// <summary>
+        /// 受理人工号
+        /// </summary>
+        public string? AcceptorStaffNo { get; set; }
+
+        /// <summary>
+        /// 受理人部门编码
+        /// </summary>
+        public string? AcceptorOrgCode { get; set; }
+
+        /// <summary>
+        /// 受理人部门名称
+        /// </summary>
+        public string? AcceptorOrgName { get; set; }
+
+        /// <summary>
+        /// 附件
+        /// </summary>
+        public List<FileDto>? Additions { get; set; } = new();
         public List<FileJson>? FileJson { get; set; }
     }
 }

src/Hotline/JudicialManagement/JudicialManagementOrders.cs

@@ -1,12 +1,129 @@
-using Hotline.Orders;
-using Hotline.Share.Dtos;
+using Hotline.Share.Dtos;
+using Hotline.Share.Dtos.File;
 using Hotline.Share.Enums.JudicialManagement;
+using Hotline.Share.Enums.Order;
 using SqlSugar;
+using XF.Domain.Extensions;
+using XF.Domain.Repository;
 
 namespace Hotline.JudicialManagement
 {
-    public class JudicialManagementOrders : Order
+    public class JudicialManagementOrders : PositionEntity
     {
+        /// <summary>
+        /// 来源渠道（电话、网站、APP等）
+        /// </summary>
+        public string? SourceChannel { get; set; }
+
+        public string? SourceChannelCode { get; set; }
+
+        /// <summary>
+        /// 来电号码
+        /// </summary>
+        public string? FromPhone { get; set; }
+
+        /// <summary>
+        /// 转接号码（转接来源）
+        /// </summary>
+        public string? TransferPhone { get; set; }
+
+        /// <summary>
+        /// 来电/信人姓名
+        /// </summary>
+        public string? FromName { get; set; }
+
+        /// <summary>
+        /// 来电/信人性别
+        /// </summary>
+        public EGender FromGender { get; set; }
+
+        /// <summary>
+        /// 来电/信人身份
+        /// </summary>
+        public EIdentityType? IdentityType { get; set; }
+
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        [SugarColumn(ColumnDescription = "联系电话", IsNullable = true)]
+        public string? Contact { get; set; }
+
+        [SugarColumn(ColumnDescription = "联系电话脱敏", IsNullable = true)]
+        public string? ContactMask { get; set; }
+
+        /// <summary>
+        /// 受理类型
+        /// </summary>
+        public string? AcceptType { get; set; }
+
+        public string? AcceptTypeCode { get; set; }
+
+        public string Title { get; set; }
+
+        /// <summary>
+        /// 热点
+        /// </summary>
+        public string? HotspotId { get; set; }
+
+        public string? HotspotName { get; set; }
+
+        public string? HotspotSpliceName { get; set; }
+
+        /// <summary>
+        /// 外部数据（为前端提供级联功能）
+        /// </summary>
+        public string? HotspotExternal { get; set; }
+
+        /// <summary>
+        /// 附件
+        /// </summary>
+        [SugarColumn(ColumnDataType = "json", IsJson = true)]
+        public List<FileDto>? Additions { get; set; } = new();
+
+        /// <summary>
+        /// 诉求内容
+        /// </summary>
+        [SugarColumn(ColumnDataType = "varchar(8000)")]
+        public string Content { get; set; }
+
+        /// <summary>
+        /// 工单编码（20220101000001）
+        /// </summary>
+        public string? No { get; set; }
+
+        /// <summary>
+        /// 市民查询密码
+        /// </summary>
+        public string? Password { get; set; }
+
+        /// <summary>
+        /// 受理人id
+        /// </summary>
+        public string? AcceptorId { get; set; }
+
+        /// <summary>
+        /// 受理人名称
+        /// </summary>
+        public string? AcceptorName { get; set; }
+
+        /// <summary>
+        /// 受理人工号
+        /// </summary>
+        public string? AcceptorStaffNo { get; set; }
+
+        /// <summary>
+        /// 受理人部门编码
+        /// </summary>
+        public string? AcceptorOrgCode { get; set; }
+
+        /// <summary>
+        /// 受理人部门名称
+        /// </summary>
+        public string? AcceptorOrgName { get; set; }
+
+        [SugarColumn(ColumnDataType = "json", IsJson = true, IsNullable = true)]
+        public List<FileJson>? FileJson { get; set; }
+
         /// <summary>
         /// 是否统计
         /// </summary>
@@ -53,6 +170,84 @@ namespace Hotline.JudicialManagement
         /// </summary>
         public string? EventTypeOneLevelId { get; set; }
 
+        /// <summary>
+        /// 是否行政执法类
+        /// </summary>
+        public bool? IsEnforcementOrder { get; set; }
+
+        /// <summary>
+        /// 同步省工单编号和省上传下来的工单都用这个字段
+        /// </summary>
+        public string? ProvinceNo { get; set; }
+
+        public void Init()
+        {
+            if (!string.IsNullOrEmpty(Contact))
+                ContactMask = Contact.MaskPhoneNumber();
+        }
+
+        public void AutoAccept(string userId, string? userName, string? staffNo)
+        {
+            AcceptorId = userId;
+            AcceptorName = userName;
+            AcceptorStaffNo = staffNo;
+        }
+
+    }
+    public abstract class PositionEntity : FullStateEntity
+    {
+        /// <summary>
+        /// 经度
+        /// </summary>
+        [SugarColumn(ColumnDescription = "经度")]
+        public double? Longitude { get; set; }
+
+        /// <summary>
+        /// 维度
+        /// </summary>
+        [SugarColumn(ColumnDescription = "纬度")]
+        public double? Latitude { get; set; }
+
+        /// <summary>
+        /// 行政区划编码
+        /// </summary>
+        [SugarColumn(ColumnDescription = "行政区划编码")]
+        public string? AreaCode { get; set; }
+
+        /// <summary>
+        /// 省
+        /// </summary>
+        public string? Province { get; set; }
+
+        /// <summary>
+        /// 市
+        /// </summary>
+        public string? City { get; set; }
+
+        /// <summary>
+        /// 区/县
+        /// </summary>
+        public string? County { get; set; }
+
+        /// <summary>
+        /// 乡镇(4级行政区划)
+        /// </summary>
+        public string? Town { get; set; }
+
+        /// <summary>
+        /// 详细街道
+        /// </summary>
+        public string? Street { get; set; }
+
+        /// <summary>
+        /// 行政区划地址
+        /// </summary>
+        public string? Address { get; set; }
+
+        /// <summary>
+        /// 完整地址
+        /// </summary>
+        public string? FullAddress { get; set; }
     }
 
 }

src/Hotline/JudicialManagement/JudicialManagementOrdersService.cs

@@ -42,7 +42,6 @@ namespace Hotline.JudicialManagement
             if (autoAccept)
             {
                 order.AutoAccept(_sessionContext.RequiredUserId, _sessionContext.UserName, _sessionContext.StaffNo);
-                order.Sign(_sessionContext.RequiredUserId, _sessionContext.UserName);
             }
             order.Init();
             order.No = GenerateNewOrderNoSF();