elink-star
/
esua-epdc-cloud
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改BUG

dev
liuchuang 6 years ago
parent
5ba231eefd
commit
e36a9ad663
3 changed files with 35 additions and 24 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. 50
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/EventUserAttitudeServiceImpl.java
  2. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  3. 7
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml

50
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/EventUserAttitudeServiceImpl.java
View File

@ -123,15 +123,25 @@ public class EventUserAttitudeServiceImpl extends BaseServiceImpl<EventUserAttit
@Override
@Transactional(rollbackFor = Exception.class)
public void statement(StatementFormDTO formDto) {
IssueEntity issueEntity = null;
ItemEntity itemEntity = null;
String eventId;
String noticeContent;
String businessId;
String userId;
boolean isIssue = true;
boolean isApprove = true;
if (StringUtils.isNotEmpty(formDto.getIssueId())) {
issueEntity = issueService.selectById(formDto.getIssueId());
IssueEntity issueEntity = issueService.selectById(formDto.getIssueId());
eventId = issueEntity.getEventId();
noticeContent = issueEntity.getIssueContent();
businessId = issueEntity.getId();
userId = issueEntity.getUserId();
} else {
isIssue = false;
itemEntity = itemService.selectById(formDto.getItemId());
ItemEntity itemEntity = itemService.selectById(formDto.getItemId());
eventId = itemEntity.getEventId();
noticeContent = itemEntity.getItemContent();
businessId = itemEntity.getId();
userId = itemEntity.getUserId();
}
if (NumConstant.ONE_STR.equals(formDto.getAttitude())) {
isApprove = false;
@ -139,23 +149,23 @@ public class EventUserAttitudeServiceImpl extends BaseServiceImpl<EventUserAttit
//根据用户id和事件id查询记录
QueryWrapper<EventUserAttitudeEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(formDto.getUserId()), "USER_ID", formDto.getUserId());
wrapper.eq(StringUtils.isNotBlank(issueEntity.getEventId()), "EVENT_ID", issueEntity.getEventId());
wrapper.eq(StringUtils.isNotBlank(eventId), "EVENT_ID", eventId);
EventUserAttitudeEntity eventUserAttitudeEntity = baseDao.selectOne(wrapper);
if ("0".equals(formDto.getAttitude()) || "1".equals(formDto.getAttitude())){
if (eventUserAttitudeEntity == null){
//没有点赞或者点踩，直接插入数据
EventUserAttitudeDTO eventUserAttitudeDTO = new EventUserAttitudeDTO();
eventUserAttitudeDTO.setEventId(issueEntity.getEventId());
eventUserAttitudeDTO.setEventId(eventId);
eventUserAttitudeDTO.setAttitudeFlag(formDto.getAttitude());
eventUserAttitudeDTO.setUserId(formDto.getUserId());
this.save(eventUserAttitudeDTO);
if ("0".equals(formDto.getAttitude())){
epdcEventsService.updateApproveNumAdd(issueEntity.getEventId());
epdcEventsService.updateApproveNumAdd(eventId);
}
if ("1".equals(formDto.getAttitude())){
epdcEventsService.updateOpposeNumAdd(issueEntity.getEventId());
epdcEventsService.updateOpposeNumAdd(eventId);
}
}else {
@ -165,12 +175,12 @@ public class EventUserAttitudeServiceImpl extends BaseServiceImpl<EventUserAttit
if ("0".equals(formDto.getAttitude())){
//赞数加1 踩数减一
epdcEventsService.updateApproveNumAdd(issueEntity.getEventId());
epdcEventsService.updateOpposeNumSubtract(issueEntity.getEventId());
epdcEventsService.updateApproveNumAdd(eventId);
epdcEventsService.updateOpposeNumSubtract(eventId);
}else {
//踩数加一 赞数减一
epdcEventsService.updateOpposeNumAdd(issueEntity.getEventId());
epdcEventsService.updateApproveNumSubtract(issueEntity.getEventId());
epdcEventsService.updateOpposeNumAdd(eventId);
epdcEventsService.updateApproveNumSubtract(eventId);
}
}
}
@ -179,11 +189,11 @@ public class EventUserAttitudeServiceImpl extends BaseServiceImpl<EventUserAttit
this.deleteById(eventUserAttitudeEntity.getId());
if ("2".equals(formDto.getAttitude())){
//取消赞
epdcEventsService.updateApproveNumSubtract(issueEntity.getEventId());
epdcEventsService.updateApproveNumSubtract(eventId);
}
if ("3".equals(formDto.getAttitude())){
//取消踩
epdcEventsService.updateOpposeNumSubtract(issueEntity.getEventId());
epdcEventsService.updateOpposeNumSubtract(eventId);
}
}
@ -192,9 +202,9 @@ public class EventUserAttitudeServiceImpl extends BaseServiceImpl<EventUserAttit
informationFormDTO.setType(EventsNoticeConstant.NOTICE_TYPE_INTERACTIVE_NOTICE);
if (isIssue) {
// 议题
informationFormDTO.setUserId(issueEntity.getUserId());
informationFormDTO.setContent(issueEntity.getIssueContent());
informationFormDTO.setBusinessId(issueEntity.getId());
informationFormDTO.setUserId(userId);
informationFormDTO.setContent(noticeContent);
informationFormDTO.setBusinessId(businessId);
if (isApprove) {
// 支持
informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_ISSUE_APPROVE);
@ -208,9 +218,9 @@ public class EventUserAttitudeServiceImpl extends BaseServiceImpl<EventUserAttit
}
} else {
// 项目
informationFormDTO.setUserId(itemEntity.getUserId());
informationFormDTO.setContent(itemEntity.getItemContent());
informationFormDTO.setBusinessId(itemEntity.getId());
informationFormDTO.setUserId(userId);
informationFormDTO.setContent(noticeContent);
informationFormDTO.setBusinessId(businessId);
if (isApprove) {
// 支持
informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_ITEM_APPROVE);

2
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
View File

@ -460,7 +460,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
String typeKey = "";
for (ItemCirculationDeptResultDTO circulationDeptResultDTO:
dto.getDeptResultDTOS()) {
if (typeKey.equals(circulationDeptResultDTO.getTypeKey())) {
if (!typeKey.equals(circulationDeptResultDTO.getTypeKey())) {
return new Result().error("不可跨部门流转协助，请重新选择流转协助部门");
}
typeKey = circulationDeptResultDTO.getTypeKey();

7
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml
View File

@ -96,7 +96,7 @@
<![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
AND t1.EVENT_ID = #{eventId}
ORDER BY
<if test="orderType == '1'">
<if test='orderType == "1"'>
attitudeNum DESC,
</if>
t1.CREATED_TIME DESC
@ -104,7 +104,7 @@
) t2
LEFT JOIN epdc_event_comment t3 ON t2.COMMENT_ID = t3.ID
ORDER BY
<if test="orderType == '1'">
<if test='orderType == "1"'>
attitudeNum DESC,
</if>
t2.CREATED_TIME DESC
@ -171,7 +171,8 @@
DEL_FLAG = '0'
AND EVENT_ID = #{eventId}
ORDER BY
statementNum DESC
statementNum DESC,
CREATED_TIME DESC
LIMIT 1
</select>

Write Preview
Loading…
Cancel
Save