|
@ -25,10 +25,9 @@ import com.elink.esua.epdc.commons.tools.page.PageData; |
|
|
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; |
|
|
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; |
|
|
import com.elink.esua.epdc.commons.tools.utils.Result; |
|
|
import com.elink.esua.epdc.commons.tools.utils.Result; |
|
|
import com.elink.esua.epdc.constant.EventIssueItemState; |
|
|
import com.elink.esua.epdc.constant.EventIssueItemState; |
|
|
import com.elink.esua.epdc.dto.issue.IssueDTO; |
|
|
import com.elink.esua.epdc.dto.issue.*; |
|
|
import com.elink.esua.epdc.dto.issue.IssueWaitHandleDetailDTO; |
|
|
|
|
|
import com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO; |
|
|
|
|
|
import com.elink.esua.epdc.dto.issue.form.IssueWaitHandleSubmitFormDTO; |
|
|
import com.elink.esua.epdc.dto.issue.form.IssueWaitHandleSubmitFormDTO; |
|
|
|
|
|
import com.elink.esua.epdc.modules.events.service.EpdcEventsService; |
|
|
import com.elink.esua.epdc.modules.issue.dao.IssueDao; |
|
|
import com.elink.esua.epdc.modules.issue.dao.IssueDao; |
|
|
import com.elink.esua.epdc.modules.issue.entity.IssueEntity; |
|
|
import com.elink.esua.epdc.modules.issue.entity.IssueEntity; |
|
|
import com.elink.esua.epdc.modules.issue.entity.IssueHandleEntity; |
|
|
import com.elink.esua.epdc.modules.issue.entity.IssueHandleEntity; |
|
@ -65,6 +64,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp |
|
|
@Autowired |
|
|
@Autowired |
|
|
private ItemHandleProcessService itemHandleProcessService; |
|
|
private ItemHandleProcessService itemHandleProcessService; |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
private EpdcEventsService epdcEventsService; |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public PageData<IssueWaitHandleOrClosedDTO> listOfIssues(Map<String, Object> params) { |
|
|
public PageData<IssueWaitHandleOrClosedDTO> listOfIssues(Map<String, Object> params) { |
|
|
IPage<IssueWaitHandleOrClosedDTO> page = getPage(params); |
|
|
IPage<IssueWaitHandleOrClosedDTO> page = getPage(params); |
|
@ -155,6 +157,23 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp |
|
|
return new Result(); |
|
|
return new Result(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
public IssueContentDetailDTO getIssueContentDetail(String issueId) { |
|
|
|
|
|
// 项目信息
|
|
|
|
|
|
ItemEntity itemEntity = itemService.getItemByIssueId(issueId); |
|
|
|
|
|
// 议题详情
|
|
|
|
|
|
IssueContentDetailDTO data = baseDao.selectOneIssueContentDetail(issueId); |
|
|
|
|
|
// 反馈和处理进度
|
|
|
|
|
|
List<IssueJobFeedbackDTO> feedbackDTOList = baseDao.selectListOfJobFeedBack(issueId, itemEntity.getId()); |
|
|
|
|
|
|
|
|
|
|
|
data.setFeedbackDTOList(feedbackDTOList); |
|
|
|
|
|
return data; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void aaa() { |
|
|
|
|
|
epdcEventsService.listOfEventsCommentSByEventId(""); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 初始化项目 |
|
|
* 初始化项目 |
|
|
* @Params: [issueEntity] |
|
|
* @Params: [issueEntity] |
|
|