修改系统配置区域

src/DataSharing.Application/Mappers/MapperConfigs.cs

@@ -77,7 +77,7 @@ namespace DataSharing.Application.Mappers
             .Map(d => d.ProcessName, x => x.WorkflowTrace.HandlerName)
             .Map(d => d.ProcessNote, x => string.IsNullOrEmpty(x.WorkflowTrace.Opinion) == false ? x.WorkflowTrace.Opinion : x.Order.ActualOpinion)
             .Map(d => d.EndAreaCode, x => string.IsNullOrEmpty(x.WorkflowTrace.HandlerOrgAreaCode) == false ? x.WorkflowTrace.HandlerOrgAreaCode : x.Order.AreaCode.Substring(0, 6))
-            .Map(d => d.EndAreaName, x => string.IsNullOrEmpty(x.WorkflowTrace.HandlerOrgAreaName) == false ? x.WorkflowTrace.HandlerOrgAreaName : "宜宾市")// x.WorkflowTrace.HandlerOrgAreaName
+           // .Map(d => d.EndAreaName, x => string.IsNullOrEmpty(x.WorkflowTrace.HandlerOrgAreaName) == false ? x.WorkflowTrace.HandlerOrgAreaName : "宜宾市")// x.WorkflowTrace.HandlerOrgAreaName
             .Map(d => d.CaseId, x => x.WorkflowTrace.Id)
             .Map(d => d.AreaCode, x => x.Order.AreaCode.Length > 6 ? x.Order.AreaCode.Substring(0, 6) : x.Order.AreaCode)
             .Map(d => d.CliengGuid, x => x.WorkflowTrace.Id)
@@ -91,7 +91,7 @@ namespace DataSharing.Application.Mappers
             .Map(d => d.ProcessName, x => x.WorkflowTrace.HandlerName)
             .Map(d => d.ProcessNote, x => string.IsNullOrEmpty(x.WorkflowTrace.Opinion) == false ? x.WorkflowTrace.Opinion : x.Order.ActualOpinion)
             .Map(d => d.EndAreaCode, x => string.IsNullOrEmpty(x.WorkflowTrace.HandlerOrgAreaCode) == false ? x.WorkflowTrace.HandlerOrgAreaCode : x.Order.AreaCode.Substring(0, 6))
-            .Map(d => d.EndAreaName, x => string.IsNullOrEmpty(x.WorkflowTrace.HandlerOrgAreaName) == false ? x.WorkflowTrace.HandlerOrgAreaName : "宜宾市")// x.WorkflowTrace.HandlerOrgAreaName
+            //.Map(d => d.EndAreaName, x => string.IsNullOrEmpty(x.WorkflowTrace.HandlerOrgAreaName) == false ? x.WorkflowTrace.HandlerOrgAreaName : "宜宾市")// x.WorkflowTrace.HandlerOrgAreaName
            .Map(d => d.TrowGuid, x => x.WorkflowTrace.Id)
            .Map(d => d.AreaCode, x => x.Order.AreaCode.Length > 6 ? x.Order.AreaCode.Substring(0, 6) : x.Order.AreaCode)
             .Map(d => d.CliengGuid, x => x.WorkflowTrace.Id)
@@ -159,7 +159,7 @@ namespace DataSharing.Application.Mappers
            .Map(d => d.FdBack, x => x.Order.ActualOpinion)
            .Map(d => d.AreaCode, x => x.Order.AreaCode.Length > 6 ? x.Order.AreaCode.Substring(0, 6) : x.Order.AreaCode)
            .Map(d => d.EndAreaCode, x => string.IsNullOrEmpty(x.Order.ActualHandleOrgAreaCode) == false ? x.Order.ActualHandleOrgAreaCode : x.Order.AreaCode.Substring(0, 6))
-           .Map(d => d.EndAreaName, x => string.IsNullOrEmpty(x.Order.ActualHandleOrgAreaName) == false ? x.Order.ActualHandleOrgAreaName : "宜宾市")
+           //.Map(d => d.EndAreaName, x => string.IsNullOrEmpty(x.Order.ActualHandleOrgAreaName) == false ? x.Order.ActualHandleOrgAreaName : "宜宾市")
            .Map(d => d.SignTimeBf, x => x.Order.ExpiredTime)
            .Map(d => d.SignTime, x => x.Order.ActualHandleStepAcceptTime)
            .Map(d => d.FdBackTimeBf, x => x.Order.ExpiredTime)
@@ -180,7 +180,7 @@ namespace DataSharing.Application.Mappers
            .Map(d => d.FdBack, x => x.ActualOpinion)
            .Map(d => d.AreaCode, x => x.AreaCode.Length > 6 ? x.AreaCode.Substring(0, 6) : x.AreaCode)
            .Map(d => d.EndAreaCode, x => string.IsNullOrEmpty(x.ActualHandleOrgAreaCode) == false ? x.ActualHandleOrgAreaCode : x.AreaCode.Substring(0, 6))
-           .Map(d => d.EndAreaName, x => string.IsNullOrEmpty(x.ActualHandleOrgAreaName) == false ? x.ActualHandleOrgAreaName : "宜宾市")
+          // .Map(d => d.EndAreaName, x => string.IsNullOrEmpty(x.ActualHandleOrgAreaName) == false ? x.ActualHandleOrgAreaName : "宜宾市")
            .Map(d => d.SignTime, x => x.ActualHandleStepAcceptTime)
            .Map(d => d.FdBackTime, x => x.ActualHandleTime)
            .Map(d => d.HandleTimeLong, x => x.HandleDurationWorkday)

src/DataSharing.Host/Controllers/ProvinceController.cs

@@ -178,7 +178,7 @@ namespace DataSharing.Host.Controllers
             if (data.Contact == "信息保密")
                 data.Contact = "";
 
-            data.City = "宜宾市";
+            data.City = _sharingConfigurationManager.GetCityName();
 
             //处理热点
             if (!string.IsNullOrEmpty(dto.CaseAccord))
@@ -1264,7 +1264,7 @@ namespace DataSharing.Host.Controllers
                     // 接口参数名称为files
                     CFormUpload.FileParameter fileParameter = new CFormUpload.FileParameter("files", fileContentBytes, fileName, null);
 
-                   // strParams = "{ \"token\": \"\", \"paras\":{ \"MATERIAL_SERIAL\":\"RGDH99511500240304000100\", \"MATERIAL_TYPE\":\"10\", \"CLIENG_GUID\":\"91541fea-e1a5-4798-bc43-b25cc77ec6b7\", \"AREA_CODE\":\"511500\"} }";
+                    // strParams = "{ \"token\": \"\", \"paras\":{ \"MATERIAL_SERIAL\":\"RGDH99511500240304000100\", \"MATERIAL_TYPE\":\"10\", \"CLIENG_GUID\":\"91541fea-e1a5-4798-bc43-b25cc77ec6b7\", \"AREA_CODE\":\"511500\"} }";
                     Dictionary<string, object> dicParam = new()
                      {
                         { "params",  strParams } // 第一个接口参数，json格式字符串

src/DataSharing/Province/ProvinceService.cs

@@ -1007,7 +1007,7 @@ namespace DataSharing.Province
                 if (!string.IsNullOrEmpty(dto.Order.ActualHandleOrgCode) && dto.Order.ActualHandleOrgCode == "001")
                     dto.Order.ActualHandleOrgName = "热线中心";
 
-                ///如果是省上派下来的，直接将区域设置为宜宾市
+                ///如果是省上派下来的，直接将区域设置为系统市州
                 if (dto.Order.Source == ESource.ProvinceStraight)
                     dto.Order.AreaCode = _sharingConfigurationManager.GetCityCode();
 
@@ -1015,13 +1015,14 @@ namespace DataSharing.Province
                 data.ConcactType = "40";
                 data.FinishType = "1";
                 data.HandleTimeLong = (decimal)dto.Order.AllDuration;
+                data.EndAreaName = string.IsNullOrEmpty(dto.Order.ActualHandleOrgAreaName) == false ? dto.Order.ActualHandleOrgAreaName : _sharingConfigurationManager.GetCityName();
                 data.ConcactType = dto.Order.RealCommunicationMode switch
                 {
                     ERealCommunicationMode.Phone => "10",
                     ERealCommunicationMode.Locale => "20",
                     _ => "40",
                 };
-                data.CliengGuid = Guid.NewGuid().ToString();
+                data.CliengGuid =dto.Id;
 
                 //中国政府网的数据处理
                 if (dto.Order.ProvinceNo.Contains("ZGZFW"))
@@ -1488,7 +1489,7 @@ namespace DataSharing.Province
 
             var configProvince = _channelConfigurationManager.GetConfigurationProvince();
 
-            ///如果是省上派下来的，直接将区域设置为宜宾市
+            ///如果是省上派下来的，直接将区域设置为系统市州
             if (dto.Order.Source == ESource.ProvinceStraight)
                 dto.Order.AreaCode = _sharingConfigurationManager.GetCityCode();
 
@@ -1497,6 +1498,7 @@ namespace DataSharing.Province
             {
                 var data = _mapper.Map<GetCaseProcessReceiveInfo>(dto);
                 data.TacheName = "70:" + data.DeptName;
+                data.EndAreaName = string.IsNullOrEmpty(dto.WorkflowTrace.HandlerOrgAreaName) == false ? dto.WorkflowTrace.HandlerOrgAreaName : _sharingConfigurationManager.GetCityName();
                 var validator = new GetCaseProcessReceiveInfoValidator();
                 var validResult = await validator.ValidateAsync(data, cancellationToken);
                 if (!validResult.IsValid)
@@ -1521,6 +1523,8 @@ namespace DataSharing.Province
                 //本地工单走市州接口
                 var data = _mapper.Map<SubmitCaseProcessInfo>(dto);
                 data.TacheName = "70:" + data.DeptName;
+                data.EndAreaCode = "";
+                data.EndAreaName = string.IsNullOrEmpty(dto.WorkflowTrace.HandlerOrgAreaName) == false ? dto.WorkflowTrace.HandlerOrgAreaName : _sharingConfigurationManager.GetCityName();
 
                 var validator = new SubmitCaseProcessInfoValidator();
                 var validResult = await validator.ValidateAsync(data, cancellationToken);
@@ -1551,7 +1555,7 @@ namespace DataSharing.Province
         /// <returns></returns>
         private async Task SubmitCaseResultAsync(OrderFlowDto dto, CancellationToken cancellationToken)
         {
-            ///如果是省上派下来的，直接将区域设置为宜宾市
+            ///如果是省上派下来的，直接将区域设置为系统市州
             if (dto.Order.Source == ESource.ProvinceStraight)
                 dto.Order.AreaCode = _sharingConfigurationManager.GetCityCode();
 
@@ -1559,7 +1563,8 @@ namespace DataSharing.Province
             data.ConcactType = "40";
             data.FinishType = "1";
             data.HandleTimeLong = (int)dto.Order.AllDuration;
-            data.CliengGuid = Guid.NewGuid().ToString();
+            data.CliengGuid = dto.WorkflowTrace.Id;
+            data.EndAreaName = string.IsNullOrEmpty(dto.Order.ActualHandleOrgAreaName) == false ? dto.Order.ActualHandleOrgAreaName : _sharingConfigurationManager.GetCityName();
 
             //宜宾工单不超期，如果在推送省上数据时，实际办理时间大于过期时间，则将办理时间改成过期时间减2个小时
             if (_sharingConfigurationManager.IsCity(ConfigurationConsts.YiBin))