Merge branch 'yantai_zhengwu_master' into dev

# Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcNeighborHoodDetailDTO.java

@@ -107,5 +107,24 @@ public class IcNeighborHoodDetailDTO {
      * 二维码地址
      */
     private String qrcodeUrl;
+
+    private String viliageTypeName;
+
+    private String area;
+
+    private String openTypeName;
+
+    private String buildYear;
+
+    /**
+     * 烟台需求：自然村/小区
+     */
+    private String viliageType;
+
+    /**
+     * 烟台需求：开放类型
+     */
+    private String openType;
+
 }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java

@@ -835,6 +835,23 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
             result.setGridName(gridInfoCache.getGridName());
         }
         result.setPropertyList(propertyManagementDao.selectPropertyNameList(neighborhoodId));
+
+        if (StringUtils.isNotBlank(result.getOpenType())){
+            if (result.getOpenType().equals("1")){
+                result.setOpenTypeName("封闭式");
+            }
+            if (result.getOpenType().equals("2")){
+                result.setOpenTypeName("开放式");
+            }
+        }
+        if (StringUtils.isNotBlank(result.getViliageType())){
+            if (result.getViliageType().equals("1")){
+                result.setViliageTypeName("住宅小区");
+            }
+            if (result.getViliageType().equals("2")){
+                result.setViliageTypeName("自然村");
+            }
+        }
         return new Result<IcNeighborHoodDetailDTO>().ok(result);
     }
 

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml

@@ -133,8 +133,8 @@
             a.LATITUDE as latitude,
             a.AREA as area,
             a.BUILD_YEAR as buildYear,
-            if(a.VILIAGE_TYPE = 1,'住宅小区',if(a.VILIAGE_TYPE = 1,'自然村','')) as viliageTypeName,
-            if(a.OPEN_TYPE = 1,'封闭式',if(a.OPEN_TYPE = 1,'开放式','')) as openTypeName
+            if(a.VILIAGE_TYPE = 1,'住宅小区',if(a.VILIAGE_TYPE = 2,'自然村','')) as viliageTypeName,
+            if(a.OPEN_TYPE = 1,'封闭式',if(a.OPEN_TYPE = 2,'开放式','')) as openTypeName
 
         from ic_neighbor_hood a
         left join customer_agency b  on a.AGENCY_ID = b.ID and b.DEL_FLAG='0'

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -533,13 +533,13 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         staffEntity.setMobile(fromDTO.getMobile());
         staffEntity.setGender(fromDTO.getGender());
         staffEntity.setWorkType(fromDTO.getWorkType());
-        staffEntity.setIdCard(customerStaffDTO.getIdCard());
-        staffEntity.setCulture(customerStaffDTO.getCulture());
-        staffEntity.setDuty(customerStaffDTO.getDuty());
-        staffEntity.setPartyPosition(customerStaffDTO.getPartyPosition());
-        staffEntity.setViliagePosition(customerStaffDTO.getViliagePosition());
-        staffEntity.setRemark(customerStaffDTO.getRemark());
-        staffEntity.setAddress(customerStaffDTO.getAddress());
+        staffEntity.setIdCard(fromDTO.getIdCard());
+        staffEntity.setCulture(fromDTO.getCulture());
+        staffEntity.setDuty(fromDTO.getDuty());
+        staffEntity.setPartyPosition(fromDTO.getPartyPosition());
+        staffEntity.setViliagePosition(fromDTO.getViliagePosition());
+        staffEntity.setRemark(fromDTO.getRemark());
+        staffEntity.setAddress(fromDTO.getAddress());
         if (StringUtils.isNotBlank(fromDTO.getIdCard())) {
             LocalDate birthday = IdCardRegexUtils.parse(fromDTO.getIdCard()).getParsedResult().getBirthday();
             staffEntity.setBirthday(DateUtils.localDate2Date(birthday));