Merge branch 'lingshan_master' into dev

# Conflicts:
#	epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java
#	epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java
#	epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java
#	epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridDetailResultDTO.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
#	epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

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

@@ -160,4 +160,6 @@ public class CustomerGridDTO implements Serializable {
      * 网格排序
      */
     private Integer sort;
+
+    private String description;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java

@@ -102,4 +102,6 @@ public class AddAgencyFormDTO implements Serializable {
      * 中心点位位置
      */
     private String centerAddress;
+
+    private String description;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java

@@ -119,6 +119,8 @@ public class AddAgencyV2FormDTO implements Serializable {
      */
     private String centerAddress;
 
+    private String description;
+
     /**
      * 社区简介
      */

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentFormDTO.java

@@ -77,5 +77,6 @@ public class AddDepartmentFormDTO implements Serializable {
      */
     private String deptType;
 
+    private String description;
 
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddGridFormDTO.java

@@ -69,4 +69,6 @@ public class AddGridFormDTO implements Serializable {
      * 中心点位位置
      */
     private String centerAddress;
+
+    private String description;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddRootAgencyFormDTO.java

@@ -87,4 +87,5 @@ public class AddRootAgencyFormDTO implements Serializable {
     @Length(max=30,message = "区县级机关名称不能超过30个字", groups = AddRootAgencyGroup.class)
     private String district;
 
+    private String description;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java

@@ -139,4 +139,9 @@ public class EditAgencyFormDTO implements Serializable {
      * 详细地址
      */
     private String fullAddress;
+
+    /**
+     * 简介
+     */
+    private String description;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditDepartmentFormDTO.java

@@ -69,4 +69,6 @@ public class EditDepartmentFormDTO implements Serializable {
      */
     private String mobile;
 
+    private String description;
+
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java

@@ -83,4 +83,6 @@ public class EditGridFormDTO implements Serializable {
      * 网格排序
      */
     private Integer sort;
+
+    private String description;
 }

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

@@ -163,4 +163,6 @@ public class AgencysResultDTO implements Serializable {
      * 详细地址
      */
     private String fullAddress;
+
+    private String description;
 }

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

@@ -80,4 +80,6 @@ public class DepartmentDetailResultDTO implements Serializable {
      */
     private String deptType = "";
 
+    private String description;
+
 }

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

@@ -98,4 +98,5 @@ public class GridDetailResultDTO implements Serializable {
 
     private String coordinates;
 
+    private String description;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java

@@ -176,4 +176,6 @@ public class CustomerAgencyEntity extends BaseEpmetEntity {
 	 */
 	private String fullAddress;
 
+
+	private String description;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java

@@ -87,4 +87,5 @@ public class CustomerDepartmentEntity extends BaseEpmetEntity {
 	 */
 	private String deptType;
 
+	private String description;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java

@@ -114,4 +114,6 @@ public class CustomerGridEntity extends BaseEpmetEntity {
 	 * 弃用：1；正常使用：0
 	 */
 	private Integer abandonFlag;
+
+	private String description;
 }

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

@@ -125,6 +125,7 @@ public class AgencyServiceImpl implements AgencyService {
         CustomerAgencyEntity entity = ConvertUtils.sourceToTarget(formDTO, CustomerAgencyEntity.class);
         entity.setOrganizationName(formDTO.getAgencyName());
         entity.setTotalUser(NumConstant.ZERO);
+        entity.setDescription(formDTO.getDescription());
         //1:查询上级机关信息
         CustomerAgencyEntity parentEntity = customerAgencyDao.selectById(formDTO.getParentAgencyId());
         if (null == parentEntity) {
@@ -174,6 +175,7 @@ public class AgencyServiceImpl implements AgencyService {
         originalEntity.setUnifiedSocialCreditCode(formDTO.getUnifiedSocialCreditCode());
         originalEntity.setUnifiedSocialCreditCodeCertificate(formDTO.getUnifiedSocialCreditCodeCertificate());
         originalEntity.setFullAddress(formDTO.getFullAddress());
+        originalEntity.setDescription(formDTO.getDescription());
         //利用mybatis 拦截器填充值
         originalEntity.setUpdatedTime(null);
         originalEntity.setUpdatedBy(null);
@@ -599,6 +601,7 @@ public class AgencyServiceImpl implements AgencyService {
         entity.setPid("0");
         entity.setTotalUser(0);
         entity.setCustomerId(form.getCustomerId());
+        entity.setDescription(form.getDescription());
         customerAgencyDao.insert(entity);
 
         return entity.getId();
@@ -989,6 +992,7 @@ public class AgencyServiceImpl implements AgencyService {
         insertEntity.setOrganizationName(formDTO.getAgencyName());
         insertEntity.setTotalUser(NumConstant.ZERO);
         insertEntity.setPid(parent.getId());
+        insertEntity.setDescription(formDTO.getDescription());
         insertEntity.setCustomerId(parent.getCustomerId());
         insertEntity.setParentAreaCode(parent.getAreaCode());
         if (StringUtils.isBlank(parent.getPid()) || NumConstant.ZERO_STR.equals(parent.getPid())) {

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

@@ -301,6 +301,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         customerGridEntity.setLatitude(addGridFormDTO.getLatitude());
         customerGridEntity.setLongitude(addGridFormDTO.getLongitude());
         customerGridEntity.setCenterAddress(addGridFormDTO.getCenterAddress());
+        customerGridEntity.setDescription(addGridFormDTO.getDescription());
         //新增area_code,部门的area_code=所属组织的area_code
         customerGridEntity.setAreaCode(null != customerAgencyDTO && StringUtils.isNotBlank(customerAgencyDTO.getAreaCode()) ? customerAgencyDTO.getAreaCode() : StrConstant.EPMETY_STR);
 
@@ -347,6 +348,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         customerGridDTO.setContacts(editGridFormDTO.getContacts());
         customerGridDTO.setMobile(editGridFormDTO.getMobile());
         customerGridDTO.setSort(editGridFormDTO.getSort());
+        customerGridDTO.setDescription(editGridFormDTO.getDescription());
         if(StringUtils.isNotBlank(editGridFormDTO.getLongitude())){
             customerGridDTO.setLongitude(editGridFormDTO.getLongitude());
         }

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

@@ -199,6 +199,8 @@
             mobile AS 'mobile',
             sort AS gridSort,
             COORDINATES AS coordinates
+            sort AS gridSort,
+            description as description
         FROM
             customer_grid
         WHERE
@@ -261,6 +263,9 @@
             <if test="sort != null and sort != ''">
                 sort = #{sort},
             </if>
+            <if test="description != null and description != ''">
+                description = #{description},
+            </if>
             UPDATED_TIME=NOW()
         where
             id = #{id}