Browse Source

Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp

master
zxc 5 years ago
parent
commit
9b16101acc
  1. 1
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java
  2. 18
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
  3. 1
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
  4. 10
      epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

1
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java

@ -73,6 +73,5 @@ public class ApplyCreateGroupFormDTO implements Serializable {
/**
* 小组类型(ordinary:楼院小组 branch:支部小组)
*/
@NotBlank(message = "小组类型不能为空")
private String groupType;
}

18
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@ -380,14 +380,18 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
@Override
public void applyCreateGroup(ApplyCreateGroupFormDTO applyCreateGroupFormDTO) {
// 查看是不是支部小组,在查询创建者是不是党员,不是党员就不走下面逻辑了
if (applyCreateGroupFormDTO.getGroupType().equals(ModuleConstant.GROUP_TYPE_BRANCH)){
Result<Boolean> booleanResult = epmetUserOpenFeignClient.selectIsPartyMemberByUserId(applyCreateGroupFormDTO.getUserId());
if (!booleanResult.success()){
throw new RenException(ModuleConstant.IS_PARTY_MEMBER_ERR);
}
if (!booleanResult.getData()){
throw new RenException(EpmetErrorCode.PARTY_MEMBER_CREATE_BRANCH_GROUP.getCode());
if (StringUtils.isNotEmpty(applyCreateGroupFormDTO.getGroupType())) {
if (applyCreateGroupFormDTO.getGroupType().equals(ModuleConstant.GROUP_TYPE_BRANCH)) {
Result<Boolean> booleanResult = epmetUserOpenFeignClient.selectIsPartyMemberByUserId(applyCreateGroupFormDTO.getUserId());
if (!booleanResult.success()) {
throw new RenException(ModuleConstant.IS_PARTY_MEMBER_ERR);
}
if (!booleanResult.getData()) {
throw new RenException(EpmetErrorCode.PARTY_MEMBER_CREATE_BRANCH_GROUP.getCode());
}
}
}else {
applyCreateGroupFormDTO.setGroupType(ModuleConstant.GROUP_TYPE_ORDINARY);
}
//1、校验是否同名
List<ResiGroupEntity> resiGroupEntityList = this.getResiGroupEntityList(applyCreateGroupFormDTO);

1
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java

@ -390,6 +390,7 @@ public interface ModuleConstant extends Constant {
* 小组类型支部小组
*/
String GROUP_TYPE_BRANCH = "branch";
String GROUP_TYPE_ORDINARY = "ordinary";
String IS_PARTY_MEMBER_ERR = "查询此人是不是党员失败了";

10
epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

@ -737,7 +737,7 @@
(SELECT
ai.ID,
ai.CREATED_BY AS userId,
DATE_FORMAT(ai.CREATED_TIME,'%Y-%m-%d %H:%m:%s') AS releaseTime,
DATE_FORMAT(ai.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime,
IFNULL(ac.CONTENT,'') AS content,
'act' AS contentType,
IFNULL(ac2.CONTENT,'') AS firstPhoto
@ -755,7 +755,7 @@
(SELECT
n.ID,
n.CREATED_BY AS userId,
DATE_FORMAT(n.CREATED_TIME,'%Y-%m-%d %H:%m:%s') AS releaseTime,
DATE_FORMAT(n.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime,
n.CONTENT AS content,
'notice' AS contentType,
IFNULL(na.ATTACHMENT_URL,'') AS firstPhoto
@ -792,7 +792,7 @@
((SELECT
t.ID,
t.CREATED_BY AS userId,
DATE_FORMAT(t.CREATED_TIME,'%Y-%m-%d %H:%m:%s') AS releaseTime,
DATE_FORMAT(t.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime,
t.TOPIC_CONTENT AS content,
t.`STATUS` AS status,
IFNULL(t.ISSUE_ID,'') AS issueId,
@ -811,7 +811,7 @@
(SELECT
ai.ID,
ai.CREATED_BY AS userId,
DATE_FORMAT(ai.CREATED_TIME,'%Y-%m-%d %H:%m:%s') AS releaseTime,
DATE_FORMAT(ai.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime,
IFNULL(ac.CONTENT,'') AS content,
ai.`STATUS` AS status,
'' AS issueId,
@ -830,7 +830,7 @@
(SELECT
n.ID,
n.CREATED_BY AS userId,
DATE_FORMAT(n.CREATED_TIME,'%Y-%m-%d %H:%m:%s') AS releaseTime,
DATE_FORMAT(n.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime,
n.CONTENT AS content,
'' AS status,
'' AS issueId,

Loading…
Cancel
Save