TANG JIANG 1 year ago
parent
commit
d94b403dea

+ 16 - 10
src/Sharing.Api/ProvinceService.cs

@@ -111,13 +111,6 @@ namespace Sharing.Api
         {
             var submitCaseInfo = _mapper.Map<SubmitCaseInfo>(dto);
 
-            //如果省和市相同直接用市,也就是直辖市的情况
-
-            submitCaseInfo.CaseAddress = dto.FullAddress;
-
-            //处理诉求渠道
-            submitCaseInfo.CaseSource = dto.SourceChannel;
-
             //处理性别
             switch (dto.FromGender)
             {
@@ -155,8 +148,6 @@ namespace Sharing.Api
                     break;
             }
 
-            submitCaseInfo.CaseType = dto.AcceptTypeCode;
-
             //处理紧急程度
             switch (dto.EmergencyLevel)
             {
@@ -171,6 +162,21 @@ namespace Sharing.Api
                     break;
             }
 
+            //处理诉求类型
+            switch (submitCaseInfo.CaseType)
+            {
+                case "10":
+                case "15":
+                case "20":
+                case "25":
+                case "30":
+                case "35":
+                    break;
+                default:
+                    submitCaseInfo.CaseType = "40";
+                    break;
+            }
+
             if (string.IsNullOrEmpty(submitCaseInfo.CaseSerial))
             {
                 submitCaseInfo.CaseSerial = dto.No;
@@ -224,7 +230,7 @@ namespace Sharing.Api
                 Priority = 0,
                 PushUrl = "submit_visit_info",
                 Method = HttpMethods.Post,
-                SyncID=data.Id
+                SyncID = data.Id
             };
             await _waitingPushDataRepository.AddAsync(pushData);
 

+ 1 - 1
src/Sharing.Api/config/appsettings.Development.json

@@ -10,7 +10,7 @@
     "Origins": [ "http://localhost:8888", "http://admin.hotline.fw.com", "http://hotline.fw.com" ]
   },
   "DatabaseConfiguration": {
-    "ApplyDbMigrations": true,
+    "ApplyDbMigrations": false,
     "ApplySeed": false
   },
   "MqConfiguration": {

+ 3 - 0
src/Sharing.Application/Mappers/MapperConfigs.cs

@@ -33,6 +33,9 @@ namespace Sharing.Application.Mappers
                 .Map(d => d.PushType, x => x.PushTypeCode)
                 .Map(d => d.AreaCode, x => x.AreaCode)
                .Map(d => d.CaseSerial, x => x.ToProvinceNo)
+               .Map(d => d.CaseSource, x => x.SourceChannelCode)
+               .Map(d => d.CaseAddress, x => x.FullAddress)
+               .Map(d => d.CaseType, x => x.AcceptTypeCode)
               ;
 
             //服务工单处理过程

+ 2 - 26
src/Sharing.Province/Controllers/ReceiveController.cs

@@ -145,6 +145,8 @@ namespace Sharing.Province.Controllers
 
             //处理组装数据,推送数据
             var data = _mapper.Map<OrderDto>(dto);
+            if (dto.TrowGuid != "【政民互动直派】")
+                data.IsProvince = true;
 
             //处理性别
             switch (dto.AppLicantSex)
@@ -180,32 +182,6 @@ namespace Sharing.Province.Controllers
                     break;
             }
 
-            ////处理受理类型
-            //switch (dto.CaseType)
-            //{
-            //    case "10":
-            //        data.AcceptType = EAcceptType.Consult;
-            //        break;
-            //    case "15":
-            //        data.AcceptType = EAcceptType.Suggest;
-            //        break;
-            //    case "20":
-            //        data.AcceptType = EAcceptType.SeekHelp;
-            //        break;
-            //    case "25":
-            //        data.AcceptType = EAcceptType.Praise;
-            //        break;
-            //    case "30":
-            //        data.AcceptType = EAcceptType.Report;
-            //        break;
-            //    case "35":
-            //        data.AcceptType = EAcceptType.Complain;
-            //        break;
-            //    case "40":
-            //        data.AcceptType = EAcceptType.Other;
-            //        break;
-            //}
-
             data.AcceptTypeCode = dto.CaseType;
 
             //处理紧急程度