@@ -9,6 +9,10 @@ import com.ningdatech.pmapi.projectdeclared.entity.vo.ProjectDeclaredDetailVO; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.vo.ProjectDeclaredListItemVO; | import com.ningdatech.pmapi.projectdeclared.entity.vo.ProjectDeclaredListItemVO; | ||||
import com.ningdatech.pmapi.projectdeclared.entity.vo.ProjectDraftVo; | import com.ningdatech.pmapi.projectdeclared.entity.vo.ProjectDraftVo; | ||||
import com.ningdatech.pmapi.projectdeclared.manage.DeclaredProjectManage; | import com.ningdatech.pmapi.projectdeclared.manage.DeclaredProjectManage; | ||||
import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; | |||||
import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; | |||||
import com.ningdatech.pmapi.projectlib.model.vo.ProjectDetailVO; | |||||
import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; | |||||
import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||
@@ -31,21 +35,17 @@ import org.springframework.web.bind.annotation.*; | |||||
public class DeclaredProjectController { | public class DeclaredProjectController { | ||||
private final DeclaredProjectManage declaredProjectManage; | private final DeclaredProjectManage declaredProjectManage; | ||||
private final ProjectLibManage projectLibManage; | |||||
@ApiOperation(value = "申报项目已申报列表", notes = "申报项目已申报列表") | @ApiOperation(value = "申报项目已申报列表", notes = "申报项目已申报列表") | ||||
@GetMapping("/list") | @GetMapping("/list") | ||||
public PageVo<ProjectDeclaredListItemVO> list(@Validated @ModelAttribute DeclaredProjectListParamDto params) {; | |||||
return declaredProjectManage.page(params); | |||||
} | |||||
@ApiOperation(value = "申报项目已申报项目", notes = "申报项目已申报项目") | |||||
@GetMapping("/{id}") | |||||
public ProjectDeclaredDetailVO detail(@PathVariable Long id) {; | |||||
return declaredProjectManage.detail(id); | |||||
public PageVo<ProjectLibListItemVO> list(@ModelAttribute ProjectListReq req) {; | |||||
return projectLibManage.projectLibList(req); | |||||
} | } | ||||
@ApiOperation(value = "申报项目草稿箱列表", notes = "申报项目草稿箱列表") | @ApiOperation(value = "申报项目草稿箱列表", notes = "申报项目草稿箱列表") | ||||
@GetMapping("/draft") | @GetMapping("/draft") | ||||
public PageVo<ProjectDraftVo> draft(@Validated @ModelAttribute DeclaredProjectListParamDto params) { | |||||
public PageVo<ProjectDraftVo> draft(@ModelAttribute DeclaredProjectListParamDto params) { | |||||
return declaredProjectManage.pageDraft(params); | return declaredProjectManage.pageDraft(params); | ||||
} | } | ||||
@@ -0,0 +1,45 @@ | |||||
package com.ningdatech.pmapi.projectdeclared.controller; | |||||
import com.ningdatech.basic.model.PageVo; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.DeclaredProjectListParamDto; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.vo.ProjectDeclaredListItemVO; | |||||
import com.ningdatech.pmapi.projectdeclared.manage.DeclaredProjectManage; | |||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | |||||
import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; | |||||
import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; | |||||
import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; | |||||
import io.swagger.annotations.Api; | |||||
import io.swagger.annotations.ApiOperation; | |||||
import lombok.RequiredArgsConstructor; | |||||
import lombok.extern.slf4j.Slf4j; | |||||
import org.springframework.validation.annotation.Validated; | |||||
import org.springframework.web.bind.annotation.GetMapping; | |||||
import org.springframework.web.bind.annotation.ModelAttribute; | |||||
import org.springframework.web.bind.annotation.RequestMapping; | |||||
import org.springframework.web.bind.annotation.RestController; | |||||
/** | |||||
* @Classname PrequalificationDeclaredController | |||||
* @Description 预审申报 | |||||
* @Date 2023/2/12 9:03 | |||||
* @Author PoffyZhang | |||||
*/ | |||||
@Slf4j | |||||
@Validated | |||||
@RestController | |||||
@RequestMapping("/api/v1/prequalification") | |||||
@Api(value = "Prequalification", tags = "申报管理-预审申报") | |||||
@RequiredArgsConstructor | |||||
public class PrequalificationDeclaredController { | |||||
private final ProjectLibManage projectLibManage; | |||||
@ApiOperation(value = "可预审申报项目列表", notes = "可预审申报项目列表") | |||||
@GetMapping("/list") | |||||
public PageVo<ProjectLibListItemVO> list(@Validated @ModelAttribute ProjectListReq req) { | |||||
//项目阶段 状态 已定 待预审 | |||||
req.setStage(ProjectStatusEnum.NOT_APPROVED.getCode()); | |||||
req.setStatus(ProjectStatusEnum.PENDING_PREQUALIFICATION.getCode()); | |||||
return projectLibManage.projectLibList(req); | |||||
} | |||||
} |
@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor; | |||||
import lombok.Builder; | import lombok.Builder; | ||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.NoArgsConstructor; | import lombok.NoArgsConstructor; | ||||
import org.springframework.format.annotation.DateTimeFormat; | |||||
/** | /** | ||||
* @Classname DeclaredProjectParamDto | * @Classname DeclaredProjectParamDto | ||||
@@ -28,7 +29,9 @@ public class DeclaredProjectListParamDto extends PagePo { | |||||
private Integer projectYear; | private Integer projectYear; | ||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") | |||||
private String startTime; | private String startTime; | ||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") | |||||
private String endTime; | private String endTime; | ||||
} | } |
@@ -11,14 +11,14 @@ import java.util.List; | |||||
/** | /** | ||||
* <p> | * <p> | ||||
* ProjectLibListItemVO | |||||
* | |||||
* </p> | * </p> | ||||
* | * | ||||
* @author WendyYang | |||||
* @author ZPF | |||||
* @since 15:13 2023/2/1 | * @since 15:13 2023/2/1 | ||||
*/ | */ | ||||
@Data | @Data | ||||
@ApiModel("申报项目列表视图") | |||||
@ApiModel("项目详情") | |||||
public class ProjectDeclaredDetailVO { | public class ProjectDeclaredDetailVO { | ||||
@ApiModelProperty("应用ID 新增为空") | @ApiModelProperty("应用ID 新增为空") | ||||
@@ -1,11 +1,14 @@ | |||||
package com.ningdatech.pmapi.projectdeclared.entity.vo; | package com.ningdatech.pmapi.projectdeclared.entity.vo; | ||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||
import lombok.Data; | import lombok.Data; | ||||
import java.math.BigDecimal; | import java.math.BigDecimal; | ||||
import java.time.LocalDateTime; | import java.time.LocalDateTime; | ||||
import java.util.Objects; | |||||
import java.util.Optional; | |||||
/** | /** | ||||
* <p> | * <p> | ||||
@@ -49,6 +52,16 @@ public class ProjectDeclaredListItemVO { | |||||
@ApiModelProperty("业务领域") | @ApiModelProperty("业务领域") | ||||
private String bizDomain; | private String bizDomain; | ||||
private String projectTypeName; | |||||
public String getProjectTypeName(){ | |||||
if(Objects.nonNull(this.projectType)){ | |||||
Optional.ofNullable(ProjectTypeEnum.getDesc(this.projectType)) | |||||
.ifPresent(desc -> this.projectTypeName = desc); | |||||
} | |||||
return this.projectTypeName; | |||||
} | |||||
@ApiModelProperty("创建时间") | @ApiModelProperty("创建时间") | ||||
private LocalDateTime createOn; | private LocalDateTime createOn; | ||||
@@ -21,6 +21,7 @@ import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | |||||
import com.ningdatech.pmapi.projectlib.model.dto.ProjectDto; | import com.ningdatech.pmapi.projectlib.model.dto.ProjectDto; | ||||
import com.ningdatech.pmapi.projectlib.model.entity.Project; | import com.ningdatech.pmapi.projectlib.model.entity.Project; | ||||
import com.ningdatech.pmapi.projectlib.model.entity.ProjectApplication; | import com.ningdatech.pmapi.projectlib.model.entity.ProjectApplication; | ||||
import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; | |||||
import com.ningdatech.pmapi.projectlib.service.IProjectApplicationService; | import com.ningdatech.pmapi.projectlib.service.IProjectApplicationService; | ||||
import com.ningdatech.pmapi.projectlib.service.IProjectService; | import com.ningdatech.pmapi.projectlib.service.IProjectService; | ||||
import com.wflow.bean.entity.WflowModels; | import com.wflow.bean.entity.WflowModels; | ||||
@@ -62,7 +63,7 @@ public class DeclaredProjectManage { | |||||
private final ProcessModelService processModelService; | private final ProcessModelService processModelService; | ||||
public PageVo<ProjectDeclaredListItemVO> page(DeclaredProjectListParamDto params) { | |||||
public PageVo<ProjectLibListItemVO> page(DeclaredProjectListParamDto params) { | |||||
Page<Project> page = params.page(); | Page<Project> page = params.page(); | ||||
LambdaQueryWrapper<Project> wrapper = Wrappers.lambdaQuery(Project.class) | LambdaQueryWrapper<Project> wrapper = Wrappers.lambdaQuery(Project.class) | ||||
.ge(Objects.nonNull(params.getStartTime()), Project::getCreateOn, params.getStartTime()) | .ge(Objects.nonNull(params.getStartTime()), Project::getCreateOn, params.getStartTime()) | ||||
@@ -77,8 +78,8 @@ public class DeclaredProjectManage { | |||||
if (0L == page.getTotal()) { | if (0L == page.getTotal()) { | ||||
return PageVo.empty(); | return PageVo.empty(); | ||||
} | } | ||||
List<ProjectDeclaredListItemVO> res = page.getRecords().stream().map(record -> { | |||||
ProjectDeclaredListItemVO vo = new ProjectDeclaredListItemVO(); | |||||
List<ProjectLibListItemVO> res = page.getRecords().stream().map(record -> { | |||||
ProjectLibListItemVO vo = new ProjectLibListItemVO(); | |||||
BeanUtils.copyProperties(record, vo); | BeanUtils.copyProperties(record, vo); | ||||
return vo; | return vo; | ||||
}).collect(Collectors.toList()); | }).collect(Collectors.toList()); | ||||
@@ -5,15 +5,12 @@ import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; | |||||
import com.ningdatech.pmapi.projectlib.model.entity.Project; | import com.ningdatech.pmapi.projectlib.model.entity.Project; | ||||
import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; | import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; | ||||
import com.ningdatech.pmapi.projectlib.model.vo.ProjectDetailVO; | |||||
import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; | import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; | ||||
import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
import lombok.AllArgsConstructor; | import lombok.AllArgsConstructor; | ||||
import org.springframework.validation.annotation.Validated; | |||||
import org.springframework.web.bind.annotation.GetMapping; | |||||
import org.springframework.web.bind.annotation.ModelAttribute; | |||||
import org.springframework.web.bind.annotation.RequestMapping; | |||||
import org.springframework.web.bind.annotation.RestController; | |||||
import org.springframework.web.bind.annotation.*; | |||||
/** | /** | ||||
* <p> | * <p> | ||||
@@ -37,9 +34,15 @@ public class ProjectLibController { | |||||
return projectLibManage.projectLibList(req); | return projectLibManage.projectLibList(req); | ||||
} | } | ||||
@GetMapping("/{id}") | |||||
@ApiOperation("获取项目详情") | |||||
private ProjectDetailVO detail (@PathVariable Long id){ | |||||
return projectLibManage.getProjectDetail(id); | |||||
} | |||||
@GetMapping("/getProjectInfo") | @GetMapping("/getProjectInfo") | ||||
@ApiOperation("获取申报项目信息") | @ApiOperation("获取申报项目信息") | ||||
private Project getProjectInfo (@Validated @ModelAttribute String processInstanceId){ | |||||
private Project getProjectInfo (@RequestParam String processInstanceId){ | |||||
return projectLibManage.getProjectInfo(processInstanceId); | return projectLibManage.getProjectInfo(processInstanceId); | ||||
} | } | ||||
@@ -7,13 +7,20 @@ import com.ningdatech.basic.model.PageVo; | |||||
import com.ningdatech.basic.util.CollUtils; | import com.ningdatech.basic.util.CollUtils; | ||||
import com.ningdatech.pmapi.projectlib.helper.ProjectHelper; | import com.ningdatech.pmapi.projectlib.helper.ProjectHelper; | ||||
import com.ningdatech.pmapi.projectlib.model.entity.Project; | import com.ningdatech.pmapi.projectlib.model.entity.Project; | ||||
import com.ningdatech.pmapi.projectlib.model.entity.ProjectApplication; | |||||
import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; | import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; | ||||
import com.ningdatech.pmapi.projectlib.model.vo.ProjectApplicationVO; | |||||
import com.ningdatech.pmapi.projectlib.model.vo.ProjectDetailVO; | |||||
import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; | import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; | ||||
import com.ningdatech.pmapi.projectlib.service.IProjectApplicationService; | |||||
import com.ningdatech.pmapi.projectlib.service.IProjectService; | import com.ningdatech.pmapi.projectlib.service.IProjectService; | ||||
import lombok.RequiredArgsConstructor; | import lombok.RequiredArgsConstructor; | ||||
import org.springframework.beans.BeanUtils; | |||||
import org.springframework.stereotype.Component; | import org.springframework.stereotype.Component; | ||||
import java.util.List; | import java.util.List; | ||||
import java.util.Objects; | |||||
import java.util.Optional; | |||||
/** | /** | ||||
* <p> | * <p> | ||||
@@ -29,6 +36,8 @@ public class ProjectLibManage { | |||||
private final IProjectService projectService; | private final IProjectService projectService; | ||||
private final IProjectApplicationService applicationService; | |||||
public PageVo<ProjectLibListItemVO> projectLibList(ProjectListReq req) { | public PageVo<ProjectLibListItemVO> projectLibList(ProjectListReq req) { | ||||
LambdaQueryWrapper<Project> query = ProjectHelper.projectQuery(req); | LambdaQueryWrapper<Project> query = ProjectHelper.projectQuery(req); | ||||
Page<Project> page = projectService.page(req.page(), query); | Page<Project> page = projectService.page(req.page(), query); | ||||
@@ -55,6 +64,39 @@ public class ProjectLibManage { | |||||
/** | /** | ||||
* | * | ||||
* @param projectId 项目详情 | |||||
* @return com.ningdatech.pmapi.projectlib.model.entity.vo.ProjectDetailVO | |||||
* @author ZPF | |||||
* @since 2023/02/11 11:15 | |||||
*/ | |||||
public ProjectDetailVO getProjectDetail(Long projectId) { | |||||
// 查询项目申报信息 | |||||
Project projectInfo = projectService.getById(projectId); | |||||
if(Objects.isNull(projectInfo)){ | |||||
return null; | |||||
} | |||||
ProjectDetailVO vo = new ProjectDetailVO(); | |||||
BeanUtils.copyProperties(projectInfo, vo); | |||||
vo.buildDynamicForm(projectInfo.getDynamicForm()); | |||||
// 查询应用 | |||||
if(Objects.nonNull(vo)){ | |||||
List<ProjectApplication> applications = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class) | |||||
.eq(ProjectApplication::getProjectId, vo.getId())); | |||||
Optional.ofNullable(applications).ifPresent(apps -> | |||||
vo.setProjectApplications(CollUtils.convert(apps, | |||||
app-> { | |||||
ProjectApplicationVO appVo = new ProjectApplicationVO(); | |||||
BeanUtils.copyProperties(app, appVo); | |||||
return appVo; | |||||
} | |||||
) | |||||
)); | |||||
} | |||||
return vo; | |||||
} | |||||
/** | |||||
* | |||||
* @param instanceCode 申报项目流程实例编号 | * @param instanceCode 申报项目流程实例编号 | ||||
* @return com.ningdatech.pmapi.projectlib.model.entity.Project | * @return com.ningdatech.pmapi.projectlib.model.entity.Project | ||||
* @author CMM | * @author CMM | ||||
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel; | |||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||
import lombok.Data; | import lombok.Data; | ||||
import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
import org.springframework.format.annotation.DateTimeFormat; | |||||
import java.math.BigDecimal; | import java.math.BigDecimal; | ||||
import java.time.LocalDateTime; | import java.time.LocalDateTime; | ||||
@@ -56,12 +57,13 @@ public class ProjectListReq extends PagePo { | |||||
private BigDecimal approveAmountMax; | private BigDecimal approveAmountMax; | ||||
@ApiModelProperty("创建时间") | @ApiModelProperty("创建时间") | ||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") | |||||
private LocalDateTime createOnMin; | private LocalDateTime createOnMin; | ||||
@ApiModelProperty("创建时间") | @ApiModelProperty("创建时间") | ||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") | |||||
private LocalDateTime createOnMax; | private LocalDateTime createOnMax; | ||||
@ApiModelProperty("用户ID") | @ApiModelProperty("用户ID") | ||||
private Long userId; | private Long userId; | ||||
} | } |
@@ -0,0 +1,169 @@ | |||||
package com.ningdatech.pmapi.projectlib.model.vo; | |||||
import io.swagger.annotations.ApiModel; | |||||
import io.swagger.annotations.ApiModelProperty; | |||||
import lombok.Data; | |||||
import java.io.Serializable; | |||||
import java.time.LocalDateTime; | |||||
/** | |||||
* <p> | |||||
* 项目应用表 | |||||
* </p> | |||||
* | |||||
* @author WendyYang | |||||
* @since 2023-02-05 | |||||
*/ | |||||
@ApiModel(value = "NdProjectApplicationVO", description = "") | |||||
@Data | |||||
public class ProjectApplicationVO implements Serializable { | |||||
private static final long serialVersionUID = 1L; | |||||
@ApiModelProperty("应用ID") | |||||
private Long id; | |||||
@ApiModelProperty("项目ID") | |||||
private Long projectId; | |||||
@ApiModelProperty("是否初次建设 0否 1是") | |||||
private Integer isFirst; | |||||
@ApiModelProperty("应用名称") | |||||
private String applicationName; | |||||
@ApiModelProperty("创建时间") | |||||
private LocalDateTime createOn; | |||||
@ApiModelProperty("更新时间") | |||||
private LocalDateTime updateOn; | |||||
@ApiModelProperty("删除时间") | |||||
private LocalDateTime deleteOn; | |||||
@ApiModelProperty("关联IRS现有应用") | |||||
private String relatedExistsApplication; | |||||
@ApiModelProperty("关联IRS现有应用-IRS应用编码") | |||||
private String relatedExistsApplicationCode; | |||||
@ApiModelProperty("应用类型") | |||||
private String applicationType; | |||||
@ApiModelProperty("建设层级 1:国家 2:省级 3:市级 4:县(市、区)") | |||||
private Integer buildLevel; | |||||
@ApiModelProperty("是否统建应用 0:否 1:是") | |||||
private Integer isUniteBuild; | |||||
@ApiModelProperty("统建类型 1:全省统建 2:全市统建") | |||||
private Integer unionBuildKind; | |||||
@ApiModelProperty("是否数改系统 0:否 1:是") | |||||
private Integer isDigitalModification; | |||||
@ApiModelProperty("数改系统") | |||||
private String digitalModification; | |||||
@ApiModelProperty("业务领域") | |||||
private String bizDomain; | |||||
@ApiModelProperty("发布端") | |||||
private String publishSide; | |||||
@ApiModelProperty("是否一本账场景应用名称 0:否 1:是") | |||||
private Integer isAccountAppName; | |||||
@ApiModelProperty("一本账应用名称") | |||||
private String accountAppName; | |||||
@ApiModelProperty("领域大脑一本账") | |||||
private String domainBrainAccount; | |||||
@ApiModelProperty("是否业务协同 0:否 1:是") | |||||
private Integer isBizCooperate; | |||||
@ApiModelProperty("业务协同描述") | |||||
private String bizCooperateInfo; | |||||
@ApiModelProperty("使用范围") | |||||
private String usesRangeRemark; | |||||
@ApiModelProperty("应用简介") | |||||
private String applicationSummary; | |||||
@ApiModelProperty("应用备注") | |||||
private String applicationRemark; | |||||
@ApiModelProperty("应用总投资测算明细-文件") | |||||
private String applicationEstimateFile; | |||||
@ApiModelProperty("等保级别 1:一级 2:二级 3:三级 4:四级 5:五级") | |||||
private Integer secrecyGrade; | |||||
@ApiModelProperty("密码测评级别 1:一级 2:二级 3:三级 4:四级 5:五级") | |||||
private Integer passwordGrade; | |||||
@ApiModelProperty("是否符合国家信息技术应用创新相关规范 0:否 1:是") | |||||
private Integer nationalItSpec; | |||||
@ApiModelProperty("是否使用政务云资源 0否 1是") | |||||
private Integer useGovCloud; | |||||
@ApiModelProperty("云资源类型") | |||||
private String cloudsType; | |||||
@ApiModelProperty("云资源基础规格") | |||||
private String cloudsFoundationSpecifications; | |||||
@ApiModelProperty("云资源台数") | |||||
private Integer cloudsNumber; | |||||
@ApiModelProperty("云资源用户描述") | |||||
private String cloudsDescription; | |||||
@ApiModelProperty("网络环境 1:政务内网 2:政务外网 3:互联网 4:业务专网 5:单机") | |||||
private Integer netEnv; | |||||
@ApiModelProperty("是否使用公共数据 0否 1是") | |||||
private Integer useCommonData; | |||||
@ApiModelProperty("数据名称") | |||||
private String dataName; | |||||
@ApiModelProperty("是否使用公共组件 0否 1是") | |||||
private Integer useCommonComponent; | |||||
@ApiModelProperty("使用的公共组件名称") | |||||
private String commonComponents; | |||||
@ApiModelProperty("是否产生公共组件 0否 1是") | |||||
private Integer produceCommonComponent; | |||||
@ApiModelProperty("预计产生组件名称") | |||||
private String produceCommonComponents; | |||||
@ApiModelProperty("试点任务名称") | |||||
private String pilotTasksName; | |||||
@ApiModelProperty("试点任务编号") | |||||
private String pilotTasksCode; | |||||
@ApiModelProperty("所属重大应用名称") | |||||
private String importantTaskName; | |||||
@ApiModelProperty("所属重大应用编号") | |||||
private String importantTaskCode; | |||||
@ApiModelProperty("所属子场景应用名称") | |||||
private String subSceneApplicationName; | |||||
@ApiModelProperty("试点文件") | |||||
private String experimentsFile; | |||||
private Long createBy; | |||||
private Long updateBy; | |||||
} |
@@ -0,0 +1,294 @@ | |||||
package com.ningdatech.pmapi.projectlib.model.vo; | |||||
import com.alibaba.fastjson.JSON; | |||||
import com.ningdatech.pmapi.common.utils.BizUtils; | |||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum; | |||||
import com.ningdatech.pmapi.projectlib.model.entity.ProjectApplication; | |||||
import io.swagger.annotations.ApiModel; | |||||
import io.swagger.annotations.ApiModelProperty; | |||||
import lombok.Data; | |||||
import org.apache.commons.lang3.StringUtils; | |||||
import java.math.BigDecimal; | |||||
import java.time.LocalDateTime; | |||||
import java.util.List; | |||||
import java.util.Map; | |||||
import java.util.Objects; | |||||
import java.util.Optional; | |||||
import java.util.concurrent.atomic.AtomicReference; | |||||
/** | |||||
* <p> | |||||
* ProjectLibListItemVO | |||||
* </p> | |||||
* | |||||
* @author WendyYang | |||||
* @since 15:13 2023/2/1 | |||||
*/ | |||||
@Data | |||||
@ApiModel("项目详情") | |||||
public class ProjectDetailVO { | |||||
@ApiModelProperty("应用ID") | |||||
private Long id; | |||||
@ApiModelProperty("所属地区编号") | |||||
private String areaCode; | |||||
@ApiModelProperty("所属地区名称") | |||||
private String area; | |||||
@ApiModelProperty("项目阶段") | |||||
private Integer stage; | |||||
@ApiModelProperty("项目状态") | |||||
private Integer status; | |||||
@ApiModelProperty("项目名称") | |||||
private String projectName; | |||||
@ApiModelProperty("是否临时增补 0:否 1:是") | |||||
private Integer isTemporaryAugment; | |||||
@ApiModelProperty("项目负责人") | |||||
private String responsibleMan; | |||||
@ApiModelProperty("负责人手机号码") | |||||
private String responsibleManMobile; | |||||
@ApiModelProperty("项目联系人") | |||||
private String contactName; | |||||
@ApiModelProperty("项目联系人手机号码") | |||||
private String contactPhone; | |||||
@ApiModelProperty("建设单位名称") | |||||
private String buildOrgName; | |||||
@ApiModelProperty("建设单位统一社会信用代码") | |||||
private String buildOrgCode; | |||||
@ApiModelProperty("建设单位浙政钉ID") | |||||
private String buildOrgZheJiangGovDingId; | |||||
@ApiModelProperty("项目类型 1:建设 2:运维") | |||||
private Integer projectType; | |||||
@ApiModelProperty("是否首次新建 0:否 1:是") | |||||
private Integer isFirst; | |||||
@ApiModelProperty("项目预算年度") | |||||
private Integer projectYear; | |||||
@ApiModelProperty("项目建设起始时间") | |||||
private String beginTime; | |||||
@ApiModelProperty("项目建设终止时间") | |||||
private String endTime; | |||||
@ApiModelProperty("四大体系 1:业务应用 2:应用支撑 3:数据资源 4:基础设施") | |||||
private Integer fourSystems; | |||||
@ApiModelProperty("是否数字化改革项目 0:否 1:是") | |||||
private Integer isDigitalReform; | |||||
@ApiModelProperty("综合业务领域") | |||||
private String bizDomain; | |||||
@ApiModelProperty("建设层级 1:国家级 2:省级 3:省本级 4:市级 5:市本级 6:区县 7乡镇") | |||||
private Integer buildLevel; | |||||
@ApiModelProperty("立项依据") | |||||
private String buildBasis; | |||||
@ApiModelProperty("发改编码") | |||||
private String developCode; | |||||
@ApiModelProperty("财政编码") | |||||
private String financialCode; | |||||
@ApiModelProperty("是否上云 0:否 1:是") | |||||
private Integer isCloud; | |||||
private String cloudType; | |||||
@ApiModelProperty("等保级别 1:一级 2:二级 3:三级 4:四级 5:五级") | |||||
private Integer protectionLevel; | |||||
@ApiModelProperty("是否密评 0:否 1:是") | |||||
private Integer isSecretComments; | |||||
@ApiModelProperty("项目简介") | |||||
private String projectIntroduction; | |||||
@ApiModelProperty("资金申报情况-申报金额(万元)") | |||||
private BigDecimal declareAmount; | |||||
@ApiModelProperty("资金申报情况-自有金额(万元)") | |||||
private BigDecimal declareHaveAmount; | |||||
@ApiModelProperty("资金申报情况-政府投资-本级财政资金(万元)") | |||||
private BigDecimal declareGovOwnFinanceAmount; | |||||
@ApiModelProperty("资金申报情况-政府投资-上级补助资金(万元)") | |||||
private BigDecimal declareGovSuperiorFinanceAmount; | |||||
@ApiModelProperty("银行贷款(万元)") | |||||
private BigDecimal declareBankLendingAmount; | |||||
@ApiModelProperty("其它资金(万元)") | |||||
private BigDecimal declareOtherAmount; | |||||
@ApiModelProperty("资金分配情况-软件开发(万元)") | |||||
private BigDecimal softwareDevelopmentAmount; | |||||
@ApiModelProperty("资金分配情况-云资源、硬件购置(万元)") | |||||
private BigDecimal cloudHardwarePurchaseAmount; | |||||
@ApiModelProperty("资金分配情况-第三方服务(万元)") | |||||
private BigDecimal thirdPartyAmount; | |||||
@ApiModelProperty("年度支付计划-年度支付计划(万元)") | |||||
private BigDecimal annualPlanAmount; | |||||
@ApiModelProperty("年度支付计划-自有金额(万元)") | |||||
private BigDecimal annualPlanHaveAmount; | |||||
@ApiModelProperty("年度支付计划-政府投资-本级财政资金(万元)") | |||||
private BigDecimal annualPlanGovOwnFinanceAmount; | |||||
@ApiModelProperty("年度支付计划-政府投资-上级补助资金(万元)") | |||||
private BigDecimal annualPlanGovSuperiorFinanceAmount; | |||||
@ApiModelProperty("年度支付计划-银行贷款(万元)") | |||||
private BigDecimal annualPlanBankLendingAmount; | |||||
@ApiModelProperty("年度支付计划-其它资金(万元)") | |||||
private BigDecimal annualPlanOtherAmount; | |||||
@ApiModelProperty("立项批复资金(万元)") | |||||
private BigDecimal approvalAmount; | |||||
private LocalDateTime annualPlanAddTime; | |||||
@ApiModelProperty("核心业务-核心业务模块") | |||||
private String coreBusiness; | |||||
@ApiModelProperty("安全投入-投入项") | |||||
private String safetyInputTitle; | |||||
@ApiModelProperty("安全投入-内容描述") | |||||
private String safetyInputDescribe; | |||||
@ApiModelProperty("安全投入-金额(万元)") | |||||
private BigDecimal safetyInputAmount; | |||||
@ApiModelProperty("附件-初步方案") | |||||
private String preliminaryPlanFile; | |||||
@ApiModelProperty("附件-佐证材料") | |||||
private String supportingMaterialsFile; | |||||
@ApiModelProperty("附件-项目总投资测算明细") | |||||
private String calculationTotalInvestmentFile; | |||||
@ApiModelProperty("附件-申报单位主要职责(单位三定方案)") | |||||
private String mainResponsibilitiesApplicantFile; | |||||
@ApiModelProperty("备注") | |||||
private String projectRemarks; | |||||
@ApiModelProperty("是否包含应用 0:否 1:是") | |||||
private Integer includeApplication; | |||||
@ApiModelProperty("工程形象进度-第一季度") | |||||
private String engineeringSpeedOne; | |||||
@ApiModelProperty("工程形象进度-第二季度") | |||||
private String engineeringSpeedTwo; | |||||
@ApiModelProperty("工程形象进度-第三季度") | |||||
private String engineeringSpeedThree; | |||||
@ApiModelProperty("工程形象进度-第四季度") | |||||
private String engineeringSpeedFour; | |||||
@ApiModelProperty("核心业务-是否开启核心业务模块 false:关闭 true:开启") | |||||
private Boolean isOpenCoreBusiness; | |||||
@ApiModelProperty("安全投入-是否开启安全投入模块 false:关闭 true:开启") | |||||
private Boolean isOpenSafetyInput; | |||||
@ApiModelProperty("工程形象进度-是否开启 false:关闭 true:开启") | |||||
private Boolean isEngineeringSpeed; | |||||
@ApiModelProperty("附件-是否开启 false:关闭 true:开启") | |||||
private Boolean isAccessories; | |||||
@ApiModelProperty("备注-是否开启 false:关闭 true:开启") | |||||
private Boolean isRemarks; | |||||
@ApiModelProperty("年度支付计划-是否开启 false:关闭 true:开启") | |||||
private Boolean isAnnualPlanAmount; | |||||
@ApiModelProperty("一地创新全省共享项目-是否开启 false:关闭 true:开启") | |||||
private Boolean isInnovateWholeProvinceShare; | |||||
@ApiModelProperty("安全投入-模块信息") | |||||
private String safetyInputModular; | |||||
@ApiModelProperty("项目申报pdf") | |||||
private String projectPdf; | |||||
@ApiModelProperty("立项申报pdf") | |||||
private String declarationPdf; | |||||
@ApiModelProperty("建设周期(月)") | |||||
private String buildCycle; | |||||
@ApiModelProperty("建设方案文件") | |||||
private String constructionPlanFile; | |||||
@ApiModelProperty("立项批复文件") | |||||
private String approvedFile; | |||||
@ApiModelProperty("批复金额") | |||||
private BigDecimal approvedTotalInvestmentIncrease; | |||||
@ApiModelProperty("上级主管部门") | |||||
private String higherSuperOrg; | |||||
@ApiModelProperty("上级主管部门Code") | |||||
private String higherSuperOrgCode; | |||||
@ApiModelProperty("主管部门名称") | |||||
private String superOrg; | |||||
@ApiModelProperty("主管部门Code") | |||||
private String superOrgCode; | |||||
@ApiModelProperty("前端所需验证字段") | |||||
private Integer allApplicationsDone; | |||||
@ApiModelProperty("项目应用") | |||||
private List<ProjectApplicationVO> projectApplications; | |||||
@ApiModelProperty("动态form") | |||||
private Map<String,Object> dynamicForm; | |||||
private String projectTypeName; | |||||
public String getProjectTypeName(){ | |||||
if(Objects.nonNull(this.projectType)){ | |||||
Optional.ofNullable(ProjectTypeEnum.getDesc(this.projectType)) | |||||
.ifPresent(desc -> this.projectTypeName = desc); | |||||
} | |||||
return this.projectTypeName; | |||||
} | |||||
public void buildDynamicForm(String dynamicFormStr){ | |||||
if(StringUtils.isNotBlank(dynamicFormStr) && BizUtils.getJSONType(dynamicFormStr)){ | |||||
this.dynamicForm = JSON.parseObject(dynamicFormStr,Map.class); | |||||
} | |||||
} | |||||
} |
@@ -1,11 +1,14 @@ | |||||
package com.ningdatech.pmapi.projectlib.model.vo; | package com.ningdatech.pmapi.projectlib.model.vo; | ||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum; | |||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import io.swagger.annotations.ApiModelProperty; | import io.swagger.annotations.ApiModelProperty; | ||||
import lombok.Data; | import lombok.Data; | ||||
import java.math.BigDecimal; | import java.math.BigDecimal; | ||||
import java.time.LocalDateTime; | import java.time.LocalDateTime; | ||||
import java.util.Objects; | |||||
import java.util.Optional; | |||||
/** | /** | ||||
* <p> | * <p> | ||||
@@ -49,6 +52,16 @@ public class ProjectLibListItemVO { | |||||
@ApiModelProperty("业务领域") | @ApiModelProperty("业务领域") | ||||
private String bizDomain; | private String bizDomain; | ||||
private String projectTypeName; | |||||
public String getProjectTypeName(){ | |||||
if(Objects.nonNull(this.projectType)){ | |||||
Optional.ofNullable(ProjectTypeEnum.getDesc(this.projectType)) | |||||
.ifPresent(desc -> this.projectTypeName = desc); | |||||
} | |||||
return this.projectTypeName; | |||||
} | |||||
@ApiModelProperty("创建时间") | @ApiModelProperty("创建时间") | ||||
private LocalDateTime createOn; | private LocalDateTime createOn; | ||||