emm

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -155,6 +155,8 @@ public enum EpmetErrorCode {
 
 	APPOINTMENT_ERROR(8528, "%s尚有未履行的预约存在，请确认后操作"),
 
+	EXISTS_SAME_PHONE_ERROR(8529, "%s存在重复"),
+
     // 该错误不会提示给前端，只是后端传输错误信息用。
     ACCESS_SQL_FILTER_MISSION_ARGS(8701, "缺少生成权限过滤SQL所需参数"),
     OPER_ADD_CUSTOMER_ROOT_AGENCY_ERROR(8702, "添加客户根级组织失败"),

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java

@@ -54,7 +54,7 @@ public class AddCommunitySelfOrganizationFormDTO implements Serializable {
     /**
      * 社区自组织创建时间
      */
-    private Date organizationCreatedTime;
+    private String organizationCreatedTime;
 
     /**
      * 经度

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

@@ -44,6 +44,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 import static com.epmet.commons.tools.utils.DateUtils.DATE_PATTERN;
 
@@ -120,6 +121,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
      * @author zxc
      * @date 2021/11/19 8:33 上午
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void addCommunitySelfOrganization(TokenDto tokenDto, AddCommunitySelfOrganizationFormDTO formDTO) {
         String customerId = tokenDto.getCustomerId();
@@ -139,6 +141,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
         orgEntity.setCustomerId(customerId);
         orgEntity.setOrgId(staffInfo.getAgencyId());
         orgEntity.setOrgType(IcCommunitySelfOrganizationConstant.ORG_TYPE_AGENCY);
+        orgEntity.setOrganizationCreatedTime(DateUtils.parse(formDTO.getOrganizationCreatedTime(), DATE_PATTERN));
         AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId());
         if (null == agencyInfo){
             throw new RenException(String.format("查询组织信息失败%s",staffInfo.getAgencyId()));
@@ -155,6 +158,22 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
         baseDao.insert(orgEntity);
         if(CollectionUtils.isNotEmpty(formDTO.getOrganizationPersonnel())){
             List<IcCommunitySelfOrganizationPersonnelEntity> persons = ConvertUtils.sourceToTarget(formDTO.getOrganizationPersonnel(), IcCommunitySelfOrganizationPersonnelEntity.class);
+            Map<String, List<IcCommunitySelfOrganizationPersonnelEntity>> groupPhone = persons.stream().collect(Collectors.groupingBy(IcCommunitySelfOrganizationPersonnelEntity::getPersonPhone));
+            List<String> phones = new ArrayList<>();
+            groupPhone.forEach((k,v) -> {
+                if (v.size() > NumConstant.ONE){
+                    phones.add(k);
+                }
+            });
+            if (CollectionUtils.isNotEmpty(phones)){
+                StringBuffer sb = new StringBuffer();
+                phones.forEach(p -> {
+                    sb.append(p).append(",");
+                });
+                String copywriter = sb.toString().substring(NumConstant.ZERO, sb.length() - NumConstant.ONE);
+                EpmetErrorCode.EXISTS_SAME_PHONE_ERROR.setMsg(String.format(EpmetErrorCode.EXISTS_SAME_PHONE_ERROR.getMsg(),copywriter));
+                throw new RenException(EpmetErrorCode.EXISTS_SAME_PHONE_ERROR.getCode());
+            }
             persons.forEach(p -> {
                 p.setCustomerId(customerId);
                 p.setOrgId(orgEntity.getId());
@@ -171,6 +190,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
      * @author zxc
      * @date 2021/11/19 10:12 上午
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void editCommunitySelfOrganization(TokenDto tokenDto, EditCommunitySelfOrganizationFormDTO formDTO) {
         LambdaQueryWrapper<IcCommunitySelfOrganizationEntity> l = new LambdaQueryWrapper<>();
@@ -189,6 +209,22 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
         personnelService.deleteByOrgId(formDTO.getOrgId());
         if (CollectionUtils.isNotEmpty(formDTO.getOrganizationPersonnel())){
             List<IcCommunitySelfOrganizationPersonnelEntity> persons = ConvertUtils.sourceToTarget(formDTO.getOrganizationPersonnel(), IcCommunitySelfOrganizationPersonnelEntity.class);
+            Map<String, List<IcCommunitySelfOrganizationPersonnelEntity>> groupPhone = persons.stream().collect(Collectors.groupingBy(IcCommunitySelfOrganizationPersonnelEntity::getPersonPhone));
+            List<String> phones = new ArrayList<>();
+            groupPhone.forEach((k,v) -> {
+                if (v.size() > NumConstant.ONE){
+                    phones.add(k);
+                }
+            });
+            if (CollectionUtils.isNotEmpty(phones)){
+                StringBuffer sb = new StringBuffer();
+                phones.forEach(p -> {
+                    sb.append(p).append(",");
+                });
+                String copywriter = sb.toString().substring(NumConstant.ZERO, sb.length() - NumConstant.ONE);
+                EpmetErrorCode.EXISTS_SAME_PHONE_ERROR.setMsg(String.format(EpmetErrorCode.EXISTS_SAME_PHONE_ERROR.getMsg(),copywriter));
+                throw new RenException(EpmetErrorCode.EXISTS_SAME_PHONE_ERROR.getCode());
+            }
             persons.forEach(p -> {
                 p.setOrgId(formDTO.getOrgId());
                 p.setCustomerId(tokenDto.getCustomerId());
@@ -245,6 +281,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
      * @author zxc
      * @date 2021/11/19 4:22 下午
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void delCommunitySelfOrganization(DelCommunitySelfOrganizationFormDTO formDTO) {
         baseDao.deleteById(formDTO.getOrgId());