diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/controller/EnterpriseBaseInfoController.java b/src/main/java/com/hncy/datatrans/server/pzhdata/controller/EnterpriseBaseInfoController.java
index b178ed72e39d688c07063f0aac81e39216a8f5b8..f3d1b340b8d1b2c9c56109ec6e1d124ec039b4b7 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/controller/EnterpriseBaseInfoController.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/controller/EnterpriseBaseInfoController.java
@@ -1,6 +1,6 @@
 package com.hncy.datatrans.server.pzhdata.controller;
 
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.OrgNonPublic;
+import com.hncy.datatrans.server.pzhdata.entity.OrgNonPublic;
 import com.hncy.datatrans.server.pzhdata.service.EnterpriseBaseInfoService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/controller/HomeStayController.java b/src/main/java/com/hncy/datatrans/server/pzhdata/controller/HomeStayController.java
index 14d9f805ec1d17556f78fb3eaab5fb2f885a5fdc..908b6723a5e8dc1107fc43868727e837968d67fd 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/controller/HomeStayController.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/controller/HomeStayController.java
@@ -1,6 +1,6 @@
 package com.hncy.datatrans.server.pzhdata.controller;
 
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.HomeStay;
+import com.hncy.datatrans.server.pzhdata.entity.HomeStay;
 import com.hncy.datatrans.server.pzhdata.service.HomeStayService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/controller/OrgShorgController.java b/src/main/java/com/hncy/datatrans/server/pzhdata/controller/OrgShorgController.java
new file mode 100644
index 0000000000000000000000000000000000000000..12595aa183cc6eb6c0c4850018b3dcbe7c0b2bd8
--- /dev/null
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/controller/OrgShorgController.java
@@ -0,0 +1,40 @@
+package com.hncy.datatrans.server.pzhdata.controller;
+
+import com.hncy.datatrans.server.pzhdata.entity.OrgShorg;
+import com.hncy.datatrans.server.pzhdata.service.OrgShorgService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Author Ivan
+ * @Description controller
+ * @Date 2020/8/19 15:46
+ */
+@RestController
+@RequestMapping("/middleBaseData")
+public class OrgShorgController {
+
+    @Autowired
+    OrgShorgService orgShorgService;
+
+    /**
+     * @Author Ivan
+     * @Description 根据本地最新更新时间拉取中间库的社会组织信息
+     * @Date 2020/8/19 15:48
+     * @Param
+     * @return
+     */
+    @ApiOperation(value = "根据本地最新更新时间拉取中间库的社会组织信息", response = OrgShorg.class)
+    @RequestMapping(value = "/getNewOrgShorgByLatestDate", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
+    public List<OrgShorg> getNewOrgShorgByLatestDate(@RequestParam(value = "dateStr",required = false) String dateStr){
+        //根据本地最新更新时间拉取中间库的社会组织信息
+        List<OrgShorg> newOrgShorgByLatestDate = orgShorgService.getNewOrgShorgByLatestDate(dateStr);
+        return newOrgShorgByLatestDate;
+    }
+}
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/controller/PublicSecurityLogisticsController.java b/src/main/java/com/hncy/datatrans/server/pzhdata/controller/PublicSecurityLogisticsController.java
index ec0bdb74dcf03794ef98bd23f355e120cc618614..d72b2b392fd25f7228e0f6d61203407371a20a13 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/controller/PublicSecurityLogisticsController.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/controller/PublicSecurityLogisticsController.java
@@ -1,7 +1,6 @@
 package com.hncy.datatrans.server.pzhdata.controller;
 
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.HomeStay;
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.PublicSecurityLogistics;
+import com.hncy.datatrans.server.pzhdata.entity.PublicSecurityLogistics;
 import com.hncy.datatrans.server.pzhdata.service.PublicSecurityLogisticsService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +30,7 @@ public class PublicSecurityLogisticsController {
      * @Param
      * @return
      */
-    @ApiOperation(value = "根据本地最新更新时间拉取中间库的邮政的寄递物流信息信息", response = HomeStay.class)
+    @ApiOperation(value = "根据本地最新更新时间拉取中间库的邮政的寄递物流信息信息", response = PublicSecurityLogistics.class)
     @RequestMapping(value = "/getNewPublicSecurityLogisticsByLatestDate", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
     public List<PublicSecurityLogistics> getNewPublicSecurityLogisticsByLatestDate(@RequestParam(value = "dateStr",required = false) String dateStr){
         //根据本地最新更新时间拉取中间库的养老机构及公寓信息
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/HomeStay.java b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/HomeStay.java
similarity index 98%
rename from src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/HomeStay.java
rename to src/main/java/com/hncy/datatrans/server/pzhdata/entity/HomeStay.java
index 18da01f594bccf5bcd4e4a2def15f14ca445110a..d6ef432379be34889c8fb8cf633ee25ce903aa74 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/HomeStay.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/HomeStay.java
@@ -1,4 +1,4 @@
-package com.hncy.datatrans.server.pzhdata.entity.hnbase;
+package com.hncy.datatrans.server.pzhdata.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/OrgNonPublic.java b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/OrgNonPublic.java
similarity index 94%
rename from src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/OrgNonPublic.java
rename to src/main/java/com/hncy/datatrans/server/pzhdata/entity/OrgNonPublic.java
index ea1037496ceb8203f066fe1b1783858360974bc2..a0e66618c6fc5cf54a2a3b1e71964c259eb75194 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/OrgNonPublic.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/OrgNonPublic.java
@@ -1,9 +1,8 @@
-package com.hncy.datatrans.server.pzhdata.entity.hnbase;
+package com.hncy.datatrans.server.pzhdata.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -34,7 +33,6 @@ public class OrgNonPublic {
     private String frName;
 
     @ApiModelProperty(value = "批准日期")
-    @DateTimeFormat(pattern = "yyy-MM-dd")
     @JsonFormat(pattern = "yyy-MM-dd")
     private Date pzDate;
 
@@ -114,12 +112,11 @@ public class OrgNonPublic {
     private Integer deleted;
 
     @ApiModelProperty(value = "创建时间")
-    @DateTimeFormat(pattern = "yyy-MM-dd")
     @JsonFormat(pattern = "yyy-MM-dd")
     private Date createDate;
 
     @ApiModelProperty(value = "修改时间")
-    @DateTimeFormat(pattern = "yyy-MM-dd")
+//    @DateTimeFormat(pattern = "yyy-MM-dd")
     @JsonFormat(pattern = "yyy-MM-dd")
     private Date updateDate;
 
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/OrgShorg.java b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/OrgShorg.java
similarity index 94%
rename from src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/OrgShorg.java
rename to src/main/java/com/hncy/datatrans/server/pzhdata/entity/OrgShorg.java
index 0aa2d54bdabf3905bd8b66741040916506f99cba..54a36dcc16a47c424a156b62106b24e984867165 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/OrgShorg.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/OrgShorg.java
@@ -1,9 +1,8 @@
-package com.hncy.datatrans.server.pzhdata.entity.hnbase;
+package com.hncy.datatrans.server.pzhdata.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -37,9 +36,8 @@ public class OrgShorg {
     private String frAddress;
 
     @ApiModelProperty(value = "批准日期")
-    @DateTimeFormat(pattern = "yyy-MM-dd")
-    @JsonFormat(pattern = "yyy-MM-dd")
     private Date pzDate;
+    private String pzDateStr;
 
     @ApiModelProperty(value = "社会组织类型")
     private String shorgType;
@@ -114,9 +112,13 @@ public class OrgShorg {
     private Integer deleted;
 
     @ApiModelProperty(value = "创建时间")
+//    @DateTimeFormat(pattern = "yyy-MM-dd")
+    @JsonFormat(pattern = "yyy-MM-dd")
     private Date createDate;
 
     @ApiModelProperty(value = "修改时间")
+//    @DateTimeFormat(pattern = "yyy-MM-dd")
+    @JsonFormat(pattern = "yyy-MM-dd")
     private Date updateDate;
 
     @ApiModelProperty(value = "创建人")
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/PublicSecurityLogistics.java b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/PublicSecurityLogistics.java
similarity index 98%
rename from src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/PublicSecurityLogistics.java
rename to src/main/java/com/hncy/datatrans/server/pzhdata/entity/PublicSecurityLogistics.java
index b5250e0155167e400b45d38a881bcb94d8604efe..8c2db45fc240e8bc1e986d9e4b973353b963592c 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/entity/hnbase/PublicSecurityLogistics.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/entity/PublicSecurityLogistics.java
@@ -1,4 +1,4 @@
-package com.hncy.datatrans.server.pzhdata.entity.hnbase;
+package com.hncy.datatrans.server.pzhdata.entity;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/EnterpriseBaseInfoMapper.java b/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/EnterpriseBaseInfoMapper.java
index b3f9bc784d8cacd9b2e852098f03233acebd8669..5d8b92a865c9c85e4a0742481b1027e026b25551 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/EnterpriseBaseInfoMapper.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/EnterpriseBaseInfoMapper.java
@@ -1,7 +1,7 @@
 package com.hncy.datatrans.server.pzhdata.mapper;
 
 import com.hncy.datatrans.server.pzhdata.entity.EnterpriseBaseInfo;
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.OrgNonPublic;
+import com.hncy.datatrans.server.pzhdata.entity.OrgNonPublic;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/HomeStayMapper.java b/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/HomeStayMapper.java
index 7a689e771d1c46954331c4231d404c2ad0ef6959..d44055a905a4e0bda0f4078f25523f96f00debfc 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/HomeStayMapper.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/HomeStayMapper.java
@@ -1,6 +1,6 @@
 package com.hncy.datatrans.server.pzhdata.mapper;
 
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.HomeStay;
+import com.hncy.datatrans.server.pzhdata.entity.HomeStay;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/OrgShorgMapper.java b/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/OrgShorgMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..9567ea5aa7a25145520ae39f6a04385e76594c65
--- /dev/null
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/OrgShorgMapper.java
@@ -0,0 +1,20 @@
+package com.hncy.datatrans.server.pzhdata.mapper;
+
+import com.hncy.datatrans.server.pzhdata.entity.OrgShorg;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author Ivan
+ * @Description 社会组织信息mapper
+ * @Date 2020/8/19 15:45
+ */
+public interface OrgShorgMapper {
+
+    //根据本地最新更新时间拉取中间库的民办非企业单位信息
+    List<OrgShorg> getNewNonEnterpriseByLatestDate(@Param("dateStr") String dateStr);
+
+    //根据本地最新更新时间拉取中间库的市民政局_社会团体信息2001年至2018年
+    List<OrgShorg> getNewSocialGroupsByLatestDate(@Param("dateStr") String dateStr);
+}
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/PublicSecurityLogisticsMapper.java b/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/PublicSecurityLogisticsMapper.java
index c9bbef409ed314e364dbd13954fb162265bf9091..cf7efafba5e7351cd1f31d9161df7183d51813be 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/PublicSecurityLogisticsMapper.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/mapper/PublicSecurityLogisticsMapper.java
@@ -1,6 +1,7 @@
 package com.hncy.datatrans.server.pzhdata.mapper;
 
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.PublicSecurityLogistics;
+import com.hncy.datatrans.server.pzhdata.entity.PublicSecurityLogistics;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -11,5 +12,5 @@ import java.util.List;
  */
 public interface PublicSecurityLogisticsMapper {
     //根据本地最新更新时间拉取中间库的邮政的寄递物流信息信息
-    List<PublicSecurityLogistics> getNewPublicSecurityLogisticsByLatestDate(String dateStr);
+    List<PublicSecurityLogistics> getNewPublicSecurityLogisticsByLatestDate(@Param("dateStr") String dateStr);
 }
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/service/EnterpriseBaseInfoService.java b/src/main/java/com/hncy/datatrans/server/pzhdata/service/EnterpriseBaseInfoService.java
index 399fd3568c0a8e4c1b6626fad0dcc04baf7dd0e6..c40ea494567625277af8f8be7f67f36e93c54f64 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/service/EnterpriseBaseInfoService.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/service/EnterpriseBaseInfoService.java
@@ -1,6 +1,6 @@
 package com.hncy.datatrans.server.pzhdata.service;
 
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.OrgNonPublic;
+import com.hncy.datatrans.server.pzhdata.entity.OrgNonPublic;
 
 import java.util.List;
 
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/service/HomeStayService.java b/src/main/java/com/hncy/datatrans/server/pzhdata/service/HomeStayService.java
index 9f264c657574b52c5eb18672083cde9993b0c879..1eb4ccca2edbe1dc7f28bbd86ed1ec67be80da2c 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/service/HomeStayService.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/service/HomeStayService.java
@@ -1,6 +1,6 @@
 package com.hncy.datatrans.server.pzhdata.service;
 
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.HomeStay;
+import com.hncy.datatrans.server.pzhdata.entity.HomeStay;
 
 import java.util.List;
 
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/service/OrgShorgService.java b/src/main/java/com/hncy/datatrans/server/pzhdata/service/OrgShorgService.java
new file mode 100644
index 0000000000000000000000000000000000000000..16cae469f25a634d13f42e0df2ef1acc4a82bc2a
--- /dev/null
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/service/OrgShorgService.java
@@ -0,0 +1,15 @@
+package com.hncy.datatrans.server.pzhdata.service;
+
+import com.hncy.datatrans.server.pzhdata.entity.OrgShorg;
+
+import java.util.List;
+
+/**
+ * @Author Ivan
+ * @Description 社会组织信息service
+ * @Date 2020/8/19 15:46
+ */
+public interface OrgShorgService {
+    //根据本地最新更新时间拉取中间库的社会组织信息
+    List<OrgShorg> getNewOrgShorgByLatestDate(String dateStr);
+}
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/service/PublicSecurityLogisticsService.java b/src/main/java/com/hncy/datatrans/server/pzhdata/service/PublicSecurityLogisticsService.java
index 9c3233921c1662d2b00eb708ef3830b77e20ecab..8307024d3d94a53380ca64d6ce1c3b1978001bca 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/service/PublicSecurityLogisticsService.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/service/PublicSecurityLogisticsService.java
@@ -1,6 +1,6 @@
 package com.hncy.datatrans.server.pzhdata.service;
 
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.PublicSecurityLogistics;
+import com.hncy.datatrans.server.pzhdata.entity.PublicSecurityLogistics;
 
 import java.util.List;
 
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/EnterpriseBaseInfoServiceImpl.java b/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/EnterpriseBaseInfoServiceImpl.java
index 1f77c9bf7b0b3a181edcd6b8df2ca0fc7c090bac..409740f4b633982c5bc908e5c87778b62cc9dc9d 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/EnterpriseBaseInfoServiceImpl.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/EnterpriseBaseInfoServiceImpl.java
@@ -1,6 +1,6 @@
 package com.hncy.datatrans.server.pzhdata.service.impl;
 
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.OrgNonPublic;
+import com.hncy.datatrans.server.pzhdata.entity.OrgNonPublic;
 import com.hncy.datatrans.server.pzhdata.mapper.EnterpriseBaseInfoMapper;
 import com.hncy.datatrans.server.pzhdata.service.EnterpriseBaseInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/HomeStayServiceImpl.java b/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/HomeStayServiceImpl.java
index 20acb0f0c7aa9d1436511c410afcdc512172fd94..8b753f4d259193e69aa070a3d5c5b7630101cb55 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/HomeStayServiceImpl.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/HomeStayServiceImpl.java
@@ -1,6 +1,6 @@
 package com.hncy.datatrans.server.pzhdata.service.impl;
 
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.HomeStay;
+import com.hncy.datatrans.server.pzhdata.entity.HomeStay;
 import com.hncy.datatrans.server.pzhdata.mapper.HomeStayMapper;
 import com.hncy.datatrans.server.pzhdata.service.HomeStayService;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/OrgShorgServiceImpl.java b/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/OrgShorgServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..0724b63200e73424399209432d6a8e6764c39122
--- /dev/null
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/OrgShorgServiceImpl.java
@@ -0,0 +1,42 @@
+package com.hncy.datatrans.server.pzhdata.service.impl;
+
+import com.hncy.datatrans.server.pzhdata.entity.OrgShorg;
+import com.hncy.datatrans.server.pzhdata.mapper.OrgShorgMapper;
+import com.hncy.datatrans.server.pzhdata.service.OrgShorgService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author Ivan
+ * @Description 社会组织信息service实现类
+ * @Date 2020/8/19 15:46
+ */
+@Service
+public class OrgShorgServiceImpl implements OrgShorgService {
+
+    @Autowired
+    OrgShorgMapper orgShorgMapper;
+
+    /**
+     * @Author Ivan
+     * @Description 根据本地最新更新时间拉取中间库的社会组织信息
+     * @Date 2020/8/19 15:50
+     * @Param 
+     * @return 
+     */
+    @Override
+    public List<OrgShorg> getNewOrgShorgByLatestDate(String dateStr) {
+        List<OrgShorg> orgShorgs = new ArrayList<>();
+        //根据本地最新更新时间拉取中间库的民办非企业单位信息	mzj_pzhsmbfqydwxx
+        List<OrgShorg> org1 = orgShorgMapper.getNewNonEnterpriseByLatestDate(dateStr);
+        //根据本地最新更新时间拉取中间库的市民政局_社会团体信息2001年至2018年 mzj_pzhsshttxx
+        List<OrgShorg> org2 = orgShorgMapper.getNewSocialGroupsByLatestDate(dateStr);
+
+        orgShorgs.addAll(org1);
+        orgShorgs.addAll(org2);
+        return orgShorgs;
+    }
+}
diff --git a/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/PublicSecurityLogisticsServiceImpl.java b/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/PublicSecurityLogisticsServiceImpl.java
index fab6bf9441feed136cb723a393af7fbe86d753fb..e08e0056ec1f95153b0f82437688a3812638760a 100644
--- a/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/PublicSecurityLogisticsServiceImpl.java
+++ b/src/main/java/com/hncy/datatrans/server/pzhdata/service/impl/PublicSecurityLogisticsServiceImpl.java
@@ -1,6 +1,6 @@
 package com.hncy.datatrans.server.pzhdata.service.impl;
 
-import com.hncy.datatrans.server.pzhdata.entity.hnbase.PublicSecurityLogistics;
+import com.hncy.datatrans.server.pzhdata.entity.PublicSecurityLogistics;
 import com.hncy.datatrans.server.pzhdata.mapper.PublicSecurityLogisticsMapper;
 import com.hncy.datatrans.server.pzhdata.service.PublicSecurityLogisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/resources/mapper/EnterpriseBaseInfoMapper.xml b/src/main/resources/mapper/EnterpriseBaseInfoMapper.xml
index 3e22a57d371f8aa678eb374da9299baa02ac440f..9a6bec8b62ba88eed5c86163bab8f536a067ec2a 100644
--- a/src/main/resources/mapper/EnterpriseBaseInfoMapper.xml
+++ b/src/main/resources/mapper/EnterpriseBaseInfoMapper.xml
@@ -41,7 +41,7 @@
 
 <!--  根据本地最新更新时间拉取中间库的企业信息-->
   <select id="getNewEnterpriseInfoByLatestDate"
-          resultType="com.hncy.datatrans.server.pzhdata.entity.hnbase.OrgNonPublic">
+          resultType="com.hncy.datatrans.server.pzhdata.entity.OrgNonPublic">
     select  PRIPID id,
             UNISCID creditCode,
             ENTNAME orgName,
diff --git a/src/main/resources/mapper/HomeStayMapper.xml b/src/main/resources/mapper/HomeStayMapper.xml
index 27b018cf5a92cb3866d97d01ed006c2555caa5ea..d02ed8283857415f135dd2184daaa31a9ad276f7 100644
--- a/src/main/resources/mapper/HomeStayMapper.xml
+++ b/src/main/resources/mapper/HomeStayMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hncy.datatrans.server.pzhdata.mapper.HomeStayMapper">
 
-    <resultMap id="selectMap" type="com.hncy.datatrans.server.pzhdata.entity.hnbase.HomeStay">
+    <resultMap id="selectMap" type="com.hncy.datatrans.server.pzhdata.entity.HomeStay">
         <result column="id" property="id" />
         <result column="area_id" property="areaId" />
         <result column="areaName" property="areaName" />
@@ -42,7 +42,7 @@
 
 <!--    根据本地最新更新时间拉取中间库的养老机构及公寓信息-->
     <select id="getNewHomeStayInfoByLatestDate"
-            resultType="com.hncy.datatrans.server.pzhdata.entity.hnbase.HomeStay">
+            resultType="com.hncy.datatrans.server.pzhdata.entity.HomeStay">
         select
 --             CWS,
             ID id,
diff --git a/src/main/resources/mapper/OrgShorgMapper.xml b/src/main/resources/mapper/OrgShorgMapper.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b0a4d798c550839aa215826e345ecb390911e70f
--- /dev/null
+++ b/src/main/resources/mapper/OrgShorgMapper.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hncy.datatrans.server.pzhdata.mapper.OrgShorgMapper">
+
+<!--根据本地最新更新时间拉取中间库的民办非企业单位信息 mzj_pzhsmbfqydwxx-->
+    <select id="getNewNonEnterpriseByLatestDate"
+            resultType="com.hncy.datatrans.server.pzhdata.entity.OrgShorg">
+        select
+            BZJG gljgCode,
+            BZRQ pzDateStr,
+--             CLRQ,
+--             CSZZ,
+            DWDZ officeAddress,
+            FDDBRSJ fzrTel,
+            FDDBRXM frName,
+            FDDBRZJHM fzrCardNo,
+            FMXZQH areaId,
+--             GKMJ,
+            ID id,
+--             I_LABEL,
+            I_TIME createDate,
+--             JBRSJ,
+--             JBRXM,
+--             JBRZJHM,
+            JGLX shorgType,
+--             JGLXDH,
+            JGMC shorgName,
+            PZWH registedNo,
+            SHXYDM creditCode
+--             SXQX,
+--             YWFW,
+--             ZGJDMC,
+--             ZGJGDM
+        from mzj_pzhsmbfqydwxx where 1=1
+        <if test="dateStr!=null and dateStr!=''">
+            and I_TIME &gt;= #{dateStr}
+        </if>
+    </select>
+
+<!--    根据本地最新更新时间拉取中间库的市民政局_社会团体信息2001年至2018年 mzj_pzhsshttxx-->
+    <select id="getNewSocialGroupsByLatestDate" resultType="com.hncy.datatrans.server.pzhdata.entity.OrgShorg">
+        select
+            BZJG gljgCode,
+            BZRQ pzDateStr,
+            --             CLRQ,
+            --             CSZZ,
+            DWDZ officeAddress,
+            FDDBRSJ fzrTel,
+            FDDBRXM frName,
+            FDDBRZJHM fzrCardNo,
+            FMXZQH areaId,
+            --             GKMJ,
+            ID id,
+            --             I_LABEL,
+            I_TIME createDate,
+            --             JBRSJ,
+            --             JBRXM,
+            --             JBRZJHM,
+            JGLX shorgType,
+            --             JGLXDH,
+            JGMC shorgName,
+--             PZWH registedNo,
+            SHXYDM creditCode
+            --             SXQX,
+            --             YWFW,
+            --             ZGJDMC,
+            --             ZGJGDM
+        from mzj_pzhsshttxx where 1=1
+        <if test="dateStr!=null and dateStr!=''">
+            and I_TIME &gt;= #{dateStr}
+        </if>
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/PublicSecurityLogisticsMapper.xml b/src/main/resources/mapper/PublicSecurityLogisticsMapper.xml
index 007350b3b5cd5852dedff0b38d108adac80d7222..4127a78078686151242246c40e9074dd2a893855 100644
--- a/src/main/resources/mapper/PublicSecurityLogisticsMapper.xml
+++ b/src/main/resources/mapper/PublicSecurityLogisticsMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.hncy.datatrans.server.pzhdata.mapper.PublicSecurityLogisticsMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hncy.datatrans.server.pzhdata.entity.hnbase.PublicSecurityLogistics">
+    <resultMap id="BaseResultMap" type="com.hncy.datatrans.server.pzhdata.entity.PublicSecurityLogistics">
         <id column="id" property="id" />
         <result column="license_registration_no" property="licenseRegistrationNo" />
         <result column="logistics_name" property="logisticsName" />
@@ -34,7 +34,7 @@
     </resultMap>
 <!--    根据本地最新更新时间拉取中间库的邮政的寄递物流信息信息-->
     <select id="getNewPublicSecurityLogisticsByLatestDate"
-            resultType="com.hncy.datatrans.server.pzhdata.entity.hnbase.PublicSecurityLogistics">
+            resultType="com.hncy.datatrans.server.pzhdata.entity.PublicSecurityLogistics">
         select
         CYRS numberOfEmployees,
         DJZCLX registrationTypeName,
@@ -50,15 +50,15 @@
         LZFS responsiblePersonTel,
 --         l_LABEL,
         l_TIME createDate,
-        QYDZ areaName,
+        QYDZ addressOfEnterprise,
         QYMC logisticsName,
 --         SGSMC,
---         SSQX,
+--         SSQX areaName,
 --         SXTNX,
-        SZD areaName,
+--         SZD areaName,
         WDSXT numberOfScStr,
-        XGJSL numberOfX
---         ZCQX
+        XGJSL numberOfX,
+        ZCQX areaName
         from syzglj_yzyggspgxfkb where 1=1
         <if test="dateStr!=null and dateStr!=''">
             and I_TIME &gt;= #{dateStr}