luyan
/
epmet-cloud-rizhao0920
forked from rongchao/epmet-cloud-rizhao
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/dev_dingV1' into dev_dingV1

dev
yinzuomei 3 years ago
parent
e7d2e5b033 e36345ac2a
commit
91d169b944
4 changed files with 44 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/VoteFormDTO.java
  2. 6
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationHistoryServiceImpl.java
  3. 5
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplicationDetailFormDTO.java
  4. 74
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java

3
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/VoteFormDTO.java
View File

@ -30,8 +30,9 @@ public class VoteFormDTO implements Serializable {
/**
* 当 sourceType = issue 时，是直接创建议题，无需加入小组即可表决
* 默认为resi_topic
*/
private String sourceType;
private String sourceType = "resi_topic";
}

6
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationHistoryServiceImpl.java
View File

@ -26,6 +26,7 @@ import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dao.IssueApplicationHistoryDao;
import com.epmet.dto.IssueApplicationDTO;
import com.epmet.dto.IssueApplicationHistoryDTO;
import com.epmet.dto.form.ApplicationDetailWorkFormDTO;
import com.epmet.dto.form.ApplicationHistoryWorkFormDTO;
@ -37,6 +38,7 @@ import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO;
import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
import com.epmet.service.IssueApplicationHistoryService;
import com.epmet.service.IssueApplicationService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -62,6 +64,8 @@ public class IssueApplicationHistoryServiceImpl extends BaseServiceImpl<IssueApp
private ResiGroupOpenFeignClient resiGroupOpenFeignClient;
@Autowired
private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
@Autowired
private IssueApplicationService issueApplicationService;
@Override
public PageData<IssueApplicationHistoryDTO> page(Map<String, Object> params) {
@ -136,6 +140,8 @@ public class IssueApplicationHistoryServiceImpl extends BaseServiceImpl<IssueApp
public ApplicationDetailWorkResultDTO applicationDetailWork(ApplicationDetailWorkFormDTO applicationDetailWorkFormDTO) {
ApplicationDetailFormDTO formDTO = new ApplicationDetailFormDTO();
formDTO.setIssueApplicationId(applicationDetailWorkFormDTO.getIssueApplicationId());
IssueApplicationDTO issueApplicationDTO = issueApplicationService.get(applicationDetailWorkFormDTO.getIssueApplicationId());
formDTO.setTopicIdIsNull(StringUtils.isBlank(issueApplicationDTO.getTopicId()));
Result<ApplicationDetailCopyResultDTO> result = resiGroupOpenFeignClient.applicationDetail(formDTO);
if (!result.success()){
throw new RenException("工作端查询待审核||已驳回 申请详情失败......");

5
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplicationDetailFormDTO.java
View File

@ -21,4 +21,9 @@ public class ApplicationDetailFormDTO implements Serializable {
*/
@NotBlank(message = "issueApplicationId不能为空",groups = {ApplicationDetail.class})
private String issueApplicationId;
/**
* 话题ID是否为空
*/
private Boolean topicIdIsNull;
}

74
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java
View File

@ -73,53 +73,41 @@ public class GroupIssueServiceImpl implements GroupIssueService {
List<String> userIds = new ArrayList<>();
ApplicationDetailResultDTO data = result.getData();
userIds.add(data.getUserId());
TopicInfoResultDTO topicInfoResultDTO = resiGroupDao.selectTopicInfo(data.getTopicId());
userIds.add(topicInfoResultDTO.getTopicUserId());
// 查询小组类别
ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(topicInfoResultDTO.getGroupId());
if (null == resiGroupEntity){
throw new RenException("此小组信息不存在");
}
List<UserInfoResultDTO> userInfos = resiTopicService.disPoseUserInfo(resiGroupEntity.getGroupType(), userIds);
if(CollectionUtils.isEmpty(userInfos)){
throw new RenException("未查询到用户信息");
}
userInfos.forEach(u -> {
if (u.getUserId().equals(data.getUserId())){
data.setIssuePublisher(u.getReleaseUserName());
data.setIssuePublisherMobile(u.getMobile());
if (!applicationDetailFormDTO.getTopicIdIsNull()){
TopicInfoResultDTO topicInfoResultDTO = resiGroupDao.selectTopicInfo(data.getTopicId());
userIds.add(topicInfoResultDTO.getTopicUserId());
// 查询小组类别
ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(topicInfoResultDTO.getGroupId());
if (null == resiGroupEntity){
throw new RenException("此小组信息不存在");
}
if (u.getUserId().equals(topicInfoResultDTO.getTopicUserId())){
topicInfoResultDTO.setPublishedUser(u.getReleaseUserName());
topicInfoResultDTO.setTopicPublishMobile(u.getMobile());
List<UserInfoResultDTO> userInfos = resiTopicService.disPoseUserInfo(resiGroupEntity.getGroupType(), userIds);
if(CollectionUtils.isEmpty(userInfos)){
throw new RenException("未查询到用户信息");
}
});
/*Result<List<UserBaseInfoResultDTO>> listResult = epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
if (!listResult.success()){
throw new RenException("查询话题创建者，议题创建者失败......");
}
listResult.getData().forEach(user -> {
if (user.getUserId().equals(data.getUserId())){
data.setIssuePublisher(user.getStreet().concat("-").concat(user.getSurname()).concat(getMrOrMs(user.getGender())));
data.setIssuePublisherMobile(user.getMobile());
userInfos.forEach(u -> {
if (u.getUserId().equals(data.getUserId())){
data.setIssuePublisher(u.getReleaseUserName());
data.setIssuePublisherMobile(u.getMobile());
}
if (u.getUserId().equals(topicInfoResultDTO.getTopicUserId())){
topicInfoResultDTO.setPublishedUser(u.getReleaseUserName());
topicInfoResultDTO.setTopicPublishMobile(u.getMobile());
}
});
List<String> gridIds = new ArrayList<>();
gridIds.add(data.getGridId());
Result<List<AllGridsByUserIdResultDTO>> gridListByGridIds = govOrgOpenFeignClient.getGridListByGridIds(gridIds);
if (!gridListByGridIds.success()){
throw new RenException("查询议题所属网格名称失败......");
}
if (user.getUserId().equals(topicInfoResultDTO.getTopicUserId())){
topicInfoResultDTO.setPublishedUser(user.getStreet().concat("-").concat(user.getSurname()).concat(getMrOrMs(user.getGender())));
topicInfoResultDTO.setTopicPublishMobile(user.getMobile());
}
});*/
List<String> gridIds = new ArrayList<>();
gridIds.add(data.getGridId());
Result<List<AllGridsByUserIdResultDTO>> gridListByGridIds = govOrgOpenFeignClient.getGridListByGridIds(gridIds);
if (!gridListByGridIds.success()){
throw new RenException("查询议题所属网格名称失败......");
gridListByGridIds.getData().forEach(grid -> {
if (grid.getGridId().equals(data.getGridId())){
data.setGridName(grid.getGridName());
}
});
data.setTopicInfo(topicInfoResultDTO);
}
gridListByGridIds.getData().forEach(grid -> {
if (grid.getGridId().equals(data.getGridId())){
data.setGridName(grid.getGridName());
}
});
data.setTopicInfo(topicInfoResultDTO);
return ConvertUtils.sourceToTarget(data,ApplicationDetailCopyResultDTO.class);
}

Write Preview
Loading…
Cancel
Save