tangjiang 6 kuukautta sitten
vanhempi
commit
f543ee8644

+ 1 - 1
src/DataSharing.Application/Mappers/MapperConfigs.cs

@@ -383,7 +383,7 @@ namespace DataSharing.Application.Mappers
             .Map(d => d.Fmmc, x => x.PatentName)
             .Map(d => d.Zllx, x => x.PatentTypeCode)
             .Map(d => d.ZllxMc, x => x.PatentType)
-            .Map(d => d.Accsce, x => x.BusinessPosition != null ? x.BusinessPosition.AreaCode : "")
+            .Map(d => d.Accsce, x => x.BusinessPosition != null && x.BusinessPosition.AreaCode != null ? x.BusinessPosition.AreaCode.Substring(0, 6) : "")
             .Map(d => d.Sfdd, x => x.BusinessPosition != null ? x.BusinessPosition.Address + x.BusinessPosition.Street : "")
             .Map(d => d.ControversyTime, x => x.OccurrenceTime)
             .Map(d => d.OBType, x => x.ObjectClassifyCode)

+ 19 - 0
src/DataSharing/Province/ProvinceService.cs

@@ -30,6 +30,7 @@ using XF.Domain.Cache;
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
 using XF.Domain.Repository;
+using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace DataSharing.Province
 {
@@ -1560,6 +1561,24 @@ namespace DataSharing.Province
                     break;
                 case "scjgj"://12315个性化表单
                     var formMarket = _mapper.Map<FormMarketInfo>(orderExtension);
+                    //企业所属行政区划代码
+                    if (!string.IsNullOrEmpty(formMarket.ReqUnit))
+                    {
+                        if (formMarket.ReqUnit.Contains("519"))
+                            formMarket.ReqUnit = _sharingConfigurationManager.GetCityCode();
+                        if (formMarket.ReqUnit.Length > 6)
+                            formMarket.ReqUnit = formMarket.ReqUnit.Substring(0, 6);
+                    }
+                    //实际经营地代码
+                    if (!string.IsNullOrEmpty(formMarket.Accsce))
+                    {
+                        if (formMarket.Accsce.Contains("519"))
+                            formMarket.Accsce = _sharingConfigurationManager.GetCityCode();
+                        if (formMarket.Accsce.Length > 6)
+                            formMarket.Accsce = formMarket.Accsce.Substring(0, 6);
+
+                    }
+
                     //转换数据
                     switch (orderExtension.OrderTypeCode)
                     {