|
|
@@ -15,7 +15,6 @@ import com.hz.pm.api.common.enumeration.ProjectProcessType; |
|
|
|
import com.hz.pm.api.common.helper.UserInfoHelper; |
|
|
|
import com.hz.pm.api.common.model.constant.ExistsSqlConst; |
|
|
|
import com.hz.pm.api.common.model.constant.TypeReferenceConst; |
|
|
|
import com.hz.pm.api.common.statemachine.event.ProjectStateChangeEvent; |
|
|
|
import com.hz.pm.api.common.util.BizUtils; |
|
|
|
import com.hz.pm.api.datascope.model.DataScopeDTO; |
|
|
|
import com.hz.pm.api.datascope.utils.DataScopeUtil; |
|
|
@@ -42,7 +41,10 @@ import com.hz.pm.api.projectlib.model.req.DeclaredProjectListReq; |
|
|
|
import com.hz.pm.api.projectlib.model.vo.DeclaredProjectListVO; |
|
|
|
import com.hz.pm.api.projectlib.model.vo.DeclaredRecordProgressStatVO; |
|
|
|
import com.hz.pm.api.projectlib.model.vo.MhProjectBaseInfoVO; |
|
|
|
import com.hz.pm.api.projectlib.service.*; |
|
|
|
import com.hz.pm.api.projectlib.service.IMhProjectSchemaTargetDataService; |
|
|
|
import com.hz.pm.api.projectlib.service.IMhProjectService; |
|
|
|
import com.hz.pm.api.projectlib.service.IProjectGovSystemReplaceInfosService; |
|
|
|
import com.hz.pm.api.projectlib.service.IProjectService; |
|
|
|
import com.hz.pm.api.staging.enums.MsgTypeEnum; |
|
|
|
import com.hz.pm.api.sys.manage.NoticeManage; |
|
|
|
import com.hz.pm.api.sys.manage.ProcessModelManage; |
|
|
@@ -250,7 +252,12 @@ public class DeclaredRecordManage { |
|
|
|
item.setCreateTime(w.getCreateOn()); |
|
|
|
ProjectStatus projectStatus = getDeclaredRecordStatus(w.getStatus()); |
|
|
|
item.setStatus(projectStatus.getCode()); |
|
|
|
item.setStage(projectStatus.getStageCode()); |
|
|
|
if (projectStatus.equals(ProjectStatus.DECLARED_APPROVED_RECORD_PASSED)) { |
|
|
|
// 特殊处理 |
|
|
|
item.setStage(ProjectStatus.PROJECT_APPROVED.getCode()); |
|
|
|
} else { |
|
|
|
item.setStage(projectStatus.getStageCode()); |
|
|
|
} |
|
|
|
return item; |
|
|
|
}).collect(Collectors.toList()); |
|
|
|
return PageVo.of(data, page.getTotal()); |
|
|
|