Merge remote-tracking branch 'remotes/origin/master' into yantai_master

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/IcHouseDao.xml

@@ -75,7 +75,7 @@
             AND g.CUSTOMER_ID = #{customerId}
         </if>
         GROUP BY
-        g.CUSTOMER_ID
+        g.CUSTOMER_ID,t.NEIGHBOR_HOOD_ID
     </select>
 
     <select id="neighborhoodStatStat" resultType="com.epmet.dto.stats.result.FactUserHouseResultDTO">

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java

@@ -534,19 +534,19 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
                     //社会自组织名称重复
                     communitySeltOrgList.forEach(org -> {
                         if (obj.getOrganizationName().equals(org.getOrganizationName())) {
-                            log.warn(String.format("当前客户下的社会自组织名称已存在,社会自组织名称->%s,行号->%s", obj.getOrganizationName(), obj.getRowNum()));
+                            log.warn(String.format("当前客户下的社区自组织名称已存在,社会自组织名称->%s,行号->%s", obj.getOrganizationName(), obj.getRowNum()));
-                            errMsg.append("客户下社会自组织名称已存在;");
+                            errMsg.append("客户下社区自组织名称已存在;");
                             bl.set(true);
                         }
                     });
-                    //手机号不合规
+                    // //手机号不合规
-                    boolean m = PhoneValidatorUtils.isMobile(obj.getPrincipalPhone());
+                    // boolean m = PhoneValidatorUtils.isMobile(obj.getPrincipalPhone());
-                    boolean t = PhoneValidatorUtils.isTel(obj.getPrincipalPhone());
+                    // boolean t = PhoneValidatorUtils.isTel(obj.getPrincipalPhone());
-                    if (!m && !t){
+                    // if (!m && !t){
-                        errMsg.append("手机号码不合法;");
+                    //     errMsg.append("手机号码不合法;");
-                        bl.set(true);
+                    //     bl.set(true);
-                        log.warn("手机号码不合法,自组织名称{}", obj.getOrganizationName());
+                    //     log.warn("手机号码不合法,自组织名称{}", obj.getOrganizationName());
-                    }
+                    // }
                     if(bl.get()){
                         excel = new CommunitySelfOrgImportExcel();
                         //excel.setAgencyName(obj.getOrganizationName());
@@ -565,12 +565,15 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
                     e.setOrgType(IcCommunitySelfOrganizationConstant.ORG_TYPE_AGENCY);
                     e.setPid(agencyInfo.getPid());
                     e.setPids(agencyInfo.getPids());
-                    e.setOrganizationCreatedTime(DateUtils.parse(l.getOrganizationCreatedTime(), DATE_PATTERN));
+                    e.setOrganizationCreatedTime(StringUtils.isNotBlank(l.getOrganizationCreatedTime()) ? DateUtils.parse(l.getOrganizationCreatedTime(), DATE_PATTERN) : new Date());
                     //赋值分类编码，excel输入的是分类名称，需要找到admin字典库中的key
                     for (String key : categoryMap.keySet()) {
+                        log.info("*******key="+key+";categoryMap.get(key)="+categoryMap.get(key)+";e.getCategoryCode()="+e.getCategoryCode());
                         if (StringUtils.isNotBlank(categoryMap.get(key)) && categoryMap.get(key).equals(e.getCategoryCode())) {
-                            e.setCategoryCode(categoryMap.get(key));
+                            e.setCategoryCode(key);
                             break;
+                        }else{
+                            e.setCategoryCode(StrConstant.EPMETY_STR);
                         }
                     }
                     List<IcCommunitySelfOrganizationPersonnelEntity> persons = new ArrayList<>();

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java

@@ -162,9 +162,9 @@ public class WorkActServiceImpl implements WorkActService {
         //校验参数
 
         //校验 活动报名截止时间应该大于当前时间
-        if (actInfoEntity.getSignUpEndTime().before(DateUtils.minStrToSecondDate(DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE)))){
+        // if (actInfoEntity.getSignUpEndTime().before(DateUtils.minStrToSecondDate(DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE)))){
-            throw new RenException(EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getCode(),EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getMsg());
+        //     throw new RenException(EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getCode(),EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getMsg());
-        }
+        // }
         this.checkPublishFormDTO(actInfoEntity);
         PublishActResultDTO publishActResultDTO=new PublishActResultDTO();
         //内容审核（活动标题、招募要求、活动内容图文）
@@ -202,10 +202,10 @@ public class WorkActServiceImpl implements WorkActService {
         ActInfoEntity actInfoEntity=this.constructActInfo(formDTO);
         //校验参数
 
-        //校验 活动报名截止时间应该大于当前时间
+        // //校验 活动报名截止时间应该大于当前时间
-        if (actInfoEntity.getSignUpEndTime().before(DateUtils.minStrToSecondDate(DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE)))){
+        // if (actInfoEntity.getSignUpEndTime().before(DateUtils.minStrToSecondDate(DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE)))){
-            throw new RenException(EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getCode(),EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getMsg());
+        //     throw new RenException(EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getCode(),EpmetErrorCode.ACT_SIGN_UP_END_TIME_EARLIER_NOW_EERROR.getMsg());
-        }
+        // }
         this.checkPublishFormDTO(actInfoEntity);
         PublishActResultDTO publishActResultDTO=new PublishActResultDTO();
         //内容审核（活动标题、招募要求、活动内容图文）

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

@@ -3,6 +3,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
 import java.io.Serializable;
 
 /**
@@ -28,4 +29,16 @@ public class MapAddAreaFormDTO implements Serializable {
 
     @NotBlank(message = "coordinates不能为空",groups = MapAddAreaForm.class)
     private String coordinates;
+
+    /**
+     * 中心位置经度 经纬度同时填写才更新
+     */
+    @Pattern(regexp = "^([-+])?\\d+(\\.\\d+)?$", message = "请输入正确的经度值",groups = MapAddAreaForm.class)
+    private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+    @Pattern(regexp = "^([-+])?\\d+(\\.\\d+)?$", message = "请输入正确的纬度值",groups = MapAddAreaForm.class)
+    private String latitude;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java

@@ -273,7 +273,7 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @author zxc
      * @date 2021/10/25 9:59 上午
      */
-    void addMapArea(@Param("orgId") String orgId, @Param("level") String level, @Param("coordinates") String coordinates);
+    void addMapArea(@Param("orgId") String orgId, @Param("level") String level, @Param("coordinates") String coordinates, @Param("latitude") String latitude, @Param("longitude") String longitude);
 
     /**
      * @param pid

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

@@ -711,7 +711,7 @@ public class AgencyServiceImpl implements AgencyService {
      */
     @Override
     public void mapAddArea(MapAddAreaFormDTO formDTO) {
-        customerAgencyDao.addMapArea(formDTO.getOrgId(), formDTO.getLevel(), formDTO.getCoordinates());
+        customerAgencyDao.addMapArea(formDTO.getOrgId(), formDTO.getLevel(), formDTO.getCoordinates(), formDTO.getLatitude(), formDTO.getLongitude());
     }
 
     /**

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

@@ -37,7 +37,12 @@
             ic_neighbor_hood
         </if>
         SET
-        COORDINATES = #{coordinates},
+        <if test="latitude != null and latitude.trim() != '' and longitude != null and longitude.trim() != ''">
+            LATITUDE = #{latitude},LONGITUDE = #{longitude},
+        </if>
+        <if test="coordinates != null and coordinates.trim() != ''">
+            COORDINATES = #{coordinates},
+        </if>
         UPDATED_TIME = NOW()
         WHERE ID = #{orgId}
         AND DEL_FLAG = '0'

epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.29__radio_default.sql

@@ -0,0 +1,6 @@
+UPDATE ic_form_item
+SET DEFAULT_VALUE = '0',UPDATED_TIME=NOW()
+WHERE
+	ITEM_TYPE = 'radio'
+	AND DEL_FLAG = '0'
+	AND ( DEFAULT_VALUE IS NULL OR DEFAULT_VALUE = '' );