Bladeren bron

添加个案类型

guqiang 1 week geleden
bovenliggende
commit
a59c82377f

+ 1 - 1
src/Hotline.Api/Controllers/JudicialManagementOrdersController.cs

@@ -258,7 +258,7 @@ namespace Hotline.Api.Controllers
                     dto.ExpiredTime = data.ExpiredTime;
                     dto.IsResolved = data.IsResolved;
                     dto.FileOpinion = data.FileOpinion;
-                    dto.CenterOpinion = data.CenterToOrgOpinion;
+                    dto.CenterOpinion = data.CenterToOrgOpinion;                   
                 }
             }
 

+ 5 - 2
src/Hotline.Application/JudicialManagement/EnforcementApplication.cs

@@ -1,4 +1,5 @@
-using Hotline.IndustryClassification;
+using Hotline.CaseLibrary;
+using Hotline.IndustryClassification;
 using Hotline.JudicialManagement;
 using Hotline.Orders;
 using Hotline.Settings;
@@ -212,6 +213,7 @@ namespace Hotline.Application.JudicialManagement
                        AcceptorStaffNo = o.AcceptorStaffNo,
                        AcceptorOrgCode = o.AcceptorOrgCode,
                        AcceptorOrgName = o.AcceptorOrgName,
+                       CaseType = o.CaseType ?? ECaseType.General
                    })
                 .MergeTable();
         }
@@ -362,7 +364,8 @@ namespace Hotline.Application.JudicialManagement
                     AcceptorStaffNo = x.AcceptorStaffNo,
                     AcceptorOrgCode = x.AcceptorOrgCode,
                     AcceptorOrgName = x.AcceptorOrgName,
-                    VisitId = p.VisitId
+                    VisitId = p.VisitId,
+                    CaseType = x.CaseType ?? ECaseType.General
                 })
                .MergeTable();
 

+ 16 - 0
src/Hotline.Share/Dtos/JudicialManagement/EnforcementOrderListDto.cs

@@ -1,5 +1,6 @@
 using Hotline.Share.Enums.Order;
 using System.Diagnostics.Metrics;
+using XF.Utility.EnumExtensions;
 
 namespace Hotline.Share.Dtos.JudicialManagement
 {
@@ -229,6 +230,21 @@ namespace Hotline.Share.Dtos.JudicialManagement
             return $"{Province}{City}{County}";
         }
 
+        /// <summary>
+        /// 个案类型
+        /// </summary>
+        public ECaseType CaseType { get; set; }
+
+        /// <summary>
+        /// 个案类型
+        /// </summary>
+        public string CaseTypeDesc
+        {
+            get
+            {
+                return CaseType.GetDescription();
+            }
+        }
     }
 
     public class EnforcementOrgSatisfactionOrderListDto : EnforcementOrderListDto

+ 18 - 0
src/Hotline.Share/Dtos/JudicialManagement/JudicialManagementAddOrderDto.cs

@@ -2,6 +2,8 @@
 using Hotline.Share.Enums.JudicialManagement;
 using Hotline.Share.Enums.Order;
 using Hotline.Share.Enums.Settings;
+using System.ComponentModel;
+using XF.Utility.EnumExtensions;
 
 namespace Hotline.Share.Dtos.JudicialManagement
 {
@@ -251,6 +253,22 @@ namespace Hotline.Share.Dtos.JudicialManagement
         {
             return $"{Province}{City}{County}{Town}";
         }
+
+        /// <summary>
+        /// 个案类型
+        /// </summary>
+        public ECaseType CaseType { get; set; }
+
+        /// <summary>
+        /// 个案类型
+        /// </summary>
+        public string CaseTypeDesc
+        {
+            get
+            {
+                return CaseType.GetDescription();
+            }
+        }
     }
 
     public class AssociatedLawEnforcementAgenciesDto