Browse Source

审核议题和转项目增加校验

feature/syp_points
liuchuang 5 years ago
parent
commit
76ade3c355
  1. 6
      esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/FieldConstant.java
  2. 31
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
  3. 10
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java
  4. 30
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
  5. 20
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
  6. 17
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

6
esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/FieldConstant.java

@ -64,4 +64,10 @@ public interface FieldConstant {
String TAG_ID = "TAG_ID";
String TAG_ID_HUMP = "tagId";
String EVENT_ID = "EVENT_ID";
String EVENT_ID_HUMP = "eventId";
String ISSUE_ID = "ISSUE_ID";
String ISSUE_ID_HUMP = "issueId";
}

31
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java

@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant;
import com.elink.esua.epdc.commons.tools.exception.RenException;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.security.content.CheckDataUtils;
import com.elink.esua.epdc.commons.tools.security.content.ModuleName;
@ -258,6 +259,9 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
|| "".equals(dto.getCategoryId()))) {
return new Result().error("分类信息不能为空");
}
// 事件审核校验
checkEventReview(dto.getId(), dto.getEventState());
EpdcEventsEntity entity = new EpdcEventsEntity();
entity.setId(dto.getId());
entity.setEventState(dto.getEventState());
@ -739,4 +743,31 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
return eventTagService.listOfEventTags();
}
/**
* 事件审核校验
*
* @param eventId 事件ID
* @param eventState 事件状态
* @return void
* @author Liuchuang
* @since 2020/9/16 10:18
*/
private void checkEventReview(String eventId, int eventState) {
boolean checkResult;
if (EventIssueItemState.EVENT_REVIEW_PASS == eventState) {
int issueCount = issueService.selectIssueCountByEventId(eventId);
checkResult = issueCount > NumConstant.ZERO;
} else if (EventIssueItemState.EVENT_REVIEW_TO_ITEM == eventState) {
int itemCount = itemService.selectItemCountByEventId(eventId);
checkResult = itemCount > NumConstant.ZERO;
} else {
EpdcEventsEntity entity = baseDao.selectById(eventId);
checkResult = eventState == entity.getEventState();
}
if (!checkResult) {
throw new RenException("该事件已审核,请勿重复操作");
}
}
}

10
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java

@ -284,4 +284,14 @@ public interface IssueService extends BaseService<IssueEntity> {
* @since 2020/3/7 12:50
*/
void modifyPartyGroupName(List<GroupFormDTO> groups);
/**
* 根据事件ID获取议题数量
*
* @param eventId 事件ID
* @return int
* @author Liuchuang
* @since 2020/9/16 10:31
*/
int selectIssueCountByEventId(String eventId);
}

30
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java

@ -189,6 +189,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
@Override
@Transactional(rollbackFor = Exception.class)
public Result saveIssueHandleResult(IssueWaitHandleSubmitFormDTO dto) {
// 转项目校验
checkChangeToItem(dto.getId(), dto.getState());
IssueHandleEntity handleEntity = new IssueHandleEntity();
handleEntity.setAdvice(dto.getAdvice());
handleEntity.setState(dto.getState());
@ -696,4 +699,31 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
return new Result();
}
@Override
public int selectIssueCountByEventId(String eventId) {
QueryWrapper<IssueEntity> wrapper = new QueryWrapper<>();
wrapper.eq(FieldConstant.EVENT_ID, eventId);
return baseDao.selectCount(wrapper);
}
/**
* 议题转项目校验
*
* @param issueId 议题ID
* @param state 状态
* @return void
* @author Liuchuang
* @since 2020/9/16 11:11
*/
private void checkChangeToItem(String issueId, int state) {
if(EventIssueItemState.ISSUE_CHANGE_TO_ITEM_AND_CIRCULATION_ASSISTANCE == state
|| EventIssueItemState.ISSUE_CHANGE_TO_ITEM == state) {
int itemCount = itemService.selectItemCountByIssueId(issueId);
if (itemCount > NumConstant.ZERO) {
throw new RenException("该议题已转为项目,请勿重复操作");
}
}
}
}

20
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java

@ -387,4 +387,24 @@ public interface ItemService extends BaseService<ItemEntity> {
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result rejectItemSatisfactionInfo(RejectRecordDTO dto);
/**
* 根据事件ID获取项目数量
*
* @param eventId 事件ID
* @return int
* @author Liuchuang
* @since 2020/9/16 10:37
*/
int selectItemCountByEventId(String eventId);
/**
* 根据议题ID获取项目数量
*
* @param issueId 议题ID
* @return int
* @author Liuchuang
* @since 2020/9/16 10:37
*/
int selectItemCountByIssueId(String issueId);
}

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

@ -74,6 +74,7 @@ import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient;
import com.elink.esua.epdc.modules.feign.UserFeignClient;
import com.elink.esua.epdc.modules.interfacelog.entity.InterfaceLogEntity;
import com.elink.esua.epdc.modules.interfacelog.service.InterfaceLogService;
import com.elink.esua.epdc.modules.issue.entity.IssueEntity;
import com.elink.esua.epdc.modules.issue.service.IssueService;
import com.elink.esua.epdc.modules.item.dao.GridPlatformHandleLogDao;
import com.elink.esua.epdc.modules.item.dao.ItemDao;
@ -1546,4 +1547,20 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
baseDao.rejectItemSatisfactionInfo(dto.getRelationId());
return new Result();
}
@Override
public int selectItemCountByEventId(String eventId) {
QueryWrapper<ItemEntity> wrapper = new QueryWrapper<>();
wrapper.eq(FieldConstant.EVENT_ID, eventId);
return baseDao.selectCount(wrapper);
}
@Override
public int selectItemCountByIssueId(String issueId) {
QueryWrapper<ItemEntity> wrapper = new QueryWrapper<>();
wrapper.eq(FieldConstant.ISSUE_ID, issueId);
return baseDao.selectCount(wrapper);
}
}

Loading…
Cancel
Save