diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java index 20d678832e..c48baca3c4 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java @@ -20,7 +20,6 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; @@ -29,11 +28,8 @@ import com.epmet.dao.IssueProcessDao; import com.epmet.dao.IssueProjectRelationDao; import com.epmet.dto.IssueDTO; import com.epmet.dto.IssueProcessDTO; -import com.epmet.dto.form.BelongGridNameFormDTO; import com.epmet.dto.form.IssueIdFormDTO; import com.epmet.dto.form.ProcessProjectIdFormDTO; -import com.epmet.dto.result.BelongGridNameResultDTO; -import com.epmet.dto.result.IssueProcessResultDTO; import com.epmet.dto.result.ProcessListResultDTO; import com.epmet.entity.IssueProcessEntity; import com.epmet.feign.GovOrgFeignClient; @@ -42,7 +38,6 @@ import com.epmet.redis.IssueProcessRedis; import com.epmet.service.IssueProcessService; import com.epmet.service.IssueService; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -149,38 +144,16 @@ public class IssueProcessServiceImpl extends BaseServiceImpl issueProcessResultDTOS = baseDao.issueProcess(issueId); - if (issueProcessResultDTOS.size()!=NumConstant.ZERO){ - String gridId = issueProcessResultDTOS.get(NumConstant.ZERO).getGridId(); - BelongGridNameFormDTO formDTO = new BelongGridNameFormDTO(); - formDTO.setGridId(gridId); - //处理部门(处理人所属的机关单位名称) eg:阜新路社区——第一网格 - BelongGridNameResultDTO data = govOrgFeignClient.getGridNameByGridId(formDTO).getData(); - BeanUtils.copyProperties(issueProcessResultDTOS,listResult); - for (IssueProcessResultDTO issueProcessResultDTO : issueProcessResultDTOS) { - ProcessListResultDTO process = new ProcessListResultDTO(); - BeanUtils.copyProperties(issueProcessResultDTO,process); - process.setDepartmentName(data.getBelongsGridName()); - listResult.add(process); - } - } + listResult = baseDao.issueProcess(issueId); }else if (issueStatus.equals(IssueConstant.ISSUE_SHIFT_PROJECT)){//已转项目——处理进展 String projectId = issueProjectRelationDao.selectProjectIdByIssueId(issueId.getIssueId()); if (!StringUtils.isBlank(projectId)) { ProcessProjectIdFormDTO formDTO = new ProcessProjectIdFormDTO(); formDTO.setProjectId(projectId); listResult = govProjectFeignClient.projectProcessList(formDTO).getData(); - //转议题时间 - IssueProcessResultDTO issueProcessResultDTO = issueProcessDao.issueBeginInfo(issueId); - String gridId = issueProcessResultDTO.getGridId(); - BelongGridNameFormDTO gridName = new BelongGridNameFormDTO(); - gridName.setGridId(gridId); - //处理部门(处理人所属的机关单位名称) eg:阜新路社区——第一网格 - BelongGridNameResultDTO data = govOrgFeignClient.getGridNameByGridId(gridName).getData(); - ProcessListResultDTO process = new ProcessListResultDTO(); - BeanUtils.copyProperties(issueProcessResultDTO,process); - process.setDepartmentName(data.getBelongsGridName()); - listResult.add(process); + //转议题信息 + ProcessListResultDTO issueProcessResultDTO = issueProcessDao.issueBeginInfo(issueId); + listResult.add(issueProcessResultDTO); } }else { return new ArrayList<>(); diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml index 519ebaaec9..00122cfade 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml @@ -99,7 +99,7 @@ - SELECT CASE WHEN issue_status = 'voting' THEN "转议题" @@ -108,8 +108,8 @@ END AS processName, UNIX_TIMESTAMP( created_time ) AS processTime, operation_explain AS progressDesc, - id AS processId, - org_id AS gridId + org_name AS departmentName, + id AS processId FROM issue_process WHERE @@ -118,13 +118,14 @@ ORDER BY created_time DESC - SELECT '转议题' AS processName, UNIX_TIMESTAMP( created_time ) AS processTime, operation_explain AS progressDesc, - id AS processId, - org_id AS gridId + org_name AS departmentName, + id AS processId FROM issue_process WHERE