@@ -1,7 +1,7 @@ | |||||
package com.ningdatech.pmapi.projectdeclared.controller; | package com.ningdatech.pmapi.projectdeclared.controller; | ||||
import com.ningdatech.basic.model.PageVo; | import com.ningdatech.basic.model.PageVo; | ||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.ConstructionPlanDto; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.ConstructionPlanDTO; | |||||
import com.ningdatech.pmapi.projectdeclared.manage.ConstructionPlanManage; | import com.ningdatech.pmapi.projectdeclared.manage.ConstructionPlanManage; | ||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | ||||
import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; | import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; | ||||
@@ -43,7 +43,7 @@ public class ConstructionPlanController { | |||||
@ApiOperation(value = "建设方案申报", notes = "建设方案申报") | @ApiOperation(value = "建设方案申报", notes = "建设方案申报") | ||||
@PostMapping("/start") | @PostMapping("/start") | ||||
public String startTheProcess(@Validated @RequestBody ConstructionPlanDto dto) { | |||||
public String startTheProcess(@Validated @RequestBody ConstructionPlanDTO dto) { | |||||
String instanceId = constructionPlanManage.startTheProcess(dto); | String instanceId = constructionPlanManage.startTheProcess(dto); | ||||
return "建设方案申报 【" + instanceId + "】 成功"; | return "建设方案申报 【" + instanceId + "】 成功"; | ||||
} | } | ||||
@@ -1,10 +1,10 @@ | |||||
package com.ningdatech.pmapi.projectdeclared.controller; | package com.ningdatech.pmapi.projectdeclared.controller; | ||||
import com.ningdatech.basic.model.PageVo; | import com.ningdatech.basic.model.PageVo; | ||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.DeclaredProjectDto; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.DeclaredProjectListParamDto; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.ProjectDraftSaveDto; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.vo.ProjectDraftVo; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.DeclaredProjectDTO; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.DeclaredProjectListParamDTO; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.ProjectDraftSaveDTO; | |||||
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.manage.ProjectLibManage; | ||||
import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; | import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; | ||||
@@ -41,25 +41,25 @@ public class DeclaredProjectController { | |||||
@ApiOperation(value = "申报项目草稿箱列表", notes = "申报项目草稿箱列表") | @ApiOperation(value = "申报项目草稿箱列表", notes = "申报项目草稿箱列表") | ||||
@GetMapping("/draft") | @GetMapping("/draft") | ||||
public PageVo<ProjectDraftVo> draft(@ModelAttribute DeclaredProjectListParamDto params) { | |||||
public PageVo<ProjectDraftVO> draft(@ModelAttribute DeclaredProjectListParamDTO params) { | |||||
return declaredProjectManage.pageDraft(params); | return declaredProjectManage.pageDraft(params); | ||||
} | } | ||||
@ApiOperation(value = "申报项目草稿箱详情", notes = "申报项目草稿箱详情") | @ApiOperation(value = "申报项目草稿箱详情", notes = "申报项目草稿箱详情") | ||||
@GetMapping("/draft/{id}") | @GetMapping("/draft/{id}") | ||||
public ProjectDraftVo draft(@PathVariable Long id) { | |||||
public ProjectDraftVO draft(@PathVariable Long id) { | |||||
return declaredProjectManage.draftDatail(id); | return declaredProjectManage.draftDatail(id); | ||||
} | } | ||||
@ApiOperation(value = "申报项目保存至草稿箱", notes = "申报项目保存至草稿箱") | @ApiOperation(value = "申报项目保存至草稿箱", notes = "申报项目保存至草稿箱") | ||||
@PostMapping("/save-to-draft") | @PostMapping("/save-to-draft") | ||||
public Object saveToDraft(@Validated @RequestBody ProjectDraftSaveDto dto) { | |||||
public Object saveToDraft(@Validated @RequestBody ProjectDraftSaveDTO dto) { | |||||
return declaredProjectManage.saveToDraft(dto); | return declaredProjectManage.saveToDraft(dto); | ||||
} | } | ||||
@ApiOperation(value = "申报项目", notes = "申报项目") | @ApiOperation(value = "申报项目", notes = "申报项目") | ||||
@PostMapping("/start") | @PostMapping("/start") | ||||
public String startTheProcess(@Validated @RequestBody DeclaredProjectDto dto) { | |||||
public String startTheProcess(@Validated @RequestBody DeclaredProjectDTO dto) { | |||||
String instanceId = declaredProjectManage.startTheProcess(dto); | String instanceId = declaredProjectManage.startTheProcess(dto); | ||||
return "启动流程实例 【" + instanceId + "】 成功"; | return "启动流程实例 【" + instanceId + "】 成功"; | ||||
} | } | ||||
@@ -1,7 +1,7 @@ | |||||
package com.ningdatech.pmapi.projectdeclared.controller; | package com.ningdatech.pmapi.projectdeclared.controller; | ||||
import com.ningdatech.basic.model.PageVo; | import com.ningdatech.basic.model.PageVo; | ||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.PreDeclaredProjectDto; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.PreDeclaredProjectDTO; | |||||
import com.ningdatech.pmapi.projectdeclared.manage.PrequalificationDeclaredProjectManage; | import com.ningdatech.pmapi.projectdeclared.manage.PrequalificationDeclaredProjectManage; | ||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | ||||
import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; | import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; | ||||
@@ -43,7 +43,7 @@ public class PrequalificationDeclaredController { | |||||
@ApiOperation(value = "申报预审", notes = "申报预审") | @ApiOperation(value = "申报预审", notes = "申报预审") | ||||
@PostMapping("/start") | @PostMapping("/start") | ||||
public String startTheProcess(@Validated @RequestBody PreDeclaredProjectDto dto) { | |||||
public String startTheProcess(@Validated @RequestBody PreDeclaredProjectDTO dto) { | |||||
String instanceId = prequalificationDeclaredProjectManage.startTheProcess(dto); | String instanceId = prequalificationDeclaredProjectManage.startTheProcess(dto); | ||||
return "提交预审 【" + instanceId + "】 成功"; | return "提交预审 【" + instanceId + "】 成功"; | ||||
} | } | ||||
@@ -22,7 +22,7 @@ import java.util.Map; | |||||
@Builder | @Builder | ||||
@NoArgsConstructor | @NoArgsConstructor | ||||
@AllArgsConstructor | @AllArgsConstructor | ||||
public class ConstructionPlanDto implements Serializable { | |||||
public class ConstructionPlanDTO implements Serializable { | |||||
@NotNull | @NotNull | ||||
private Long projectId; | private Long projectId; |
@@ -2,7 +2,7 @@ package com.ningdatech.pmapi.projectdeclared.entity.dto; | |||||
import cn.hutool.core.collection.CollUtil; | import cn.hutool.core.collection.CollUtil; | ||||
import com.google.common.collect.Maps; | import com.google.common.collect.Maps; | ||||
import com.ningdatech.pmapi.projectlib.model.dto.ProjectDto; | |||||
import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO; | |||||
import com.wflow.workflow.bean.dto.ProcessInstanceUserDto; | import com.wflow.workflow.bean.dto.ProcessInstanceUserDto; | ||||
import lombok.AllArgsConstructor; | import lombok.AllArgsConstructor; | ||||
import lombok.Builder; | import lombok.Builder; | ||||
@@ -23,10 +23,10 @@ import java.util.Map; | |||||
@Builder | @Builder | ||||
@NoArgsConstructor | @NoArgsConstructor | ||||
@AllArgsConstructor | @AllArgsConstructor | ||||
public class DeclaredProjectDto implements Serializable { | |||||
public class DeclaredProjectDTO implements Serializable { | |||||
@NotNull | @NotNull | ||||
private ProjectDto projectInfo; | |||||
private ProjectDTO projectInfo; | |||||
private Map<String,Object> formData; | private Map<String,Object> formData; | ||||
@@ -17,7 +17,7 @@ import org.springframework.format.annotation.DateTimeFormat; | |||||
@Builder | @Builder | ||||
@NoArgsConstructor | @NoArgsConstructor | ||||
@AllArgsConstructor | @AllArgsConstructor | ||||
public class DeclaredProjectListParamDto extends PagePo { | |||||
public class DeclaredProjectListParamDTO extends PagePo { | |||||
private String userId; | private String userId; | ||||
@@ -22,7 +22,7 @@ import java.util.Map; | |||||
@Builder | @Builder | ||||
@NoArgsConstructor | @NoArgsConstructor | ||||
@AllArgsConstructor | @AllArgsConstructor | ||||
public class PreDeclaredProjectDto implements Serializable { | |||||
public class PreDeclaredProjectDTO implements Serializable { | |||||
@NotNull | @NotNull | ||||
private Long projectId; | private Long projectId; |
@@ -18,7 +18,7 @@ import java.math.BigDecimal; | |||||
@Builder | @Builder | ||||
@NoArgsConstructor | @NoArgsConstructor | ||||
@AllArgsConstructor | @AllArgsConstructor | ||||
public class ProjectConditionDto implements Serializable { | |||||
public class ProjectConditionDTO implements Serializable { | |||||
private Long projectId; | private Long projectId; | ||||
@@ -1,6 +1,6 @@ | |||||
package com.ningdatech.pmapi.projectdeclared.entity.dto; | package com.ningdatech.pmapi.projectdeclared.entity.dto; | ||||
import com.ningdatech.pmapi.projectlib.model.dto.ProjectDto; | |||||
import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO; | |||||
import com.wflow.workflow.bean.dto.ProcessInstanceUserDto; | import com.wflow.workflow.bean.dto.ProcessInstanceUserDto; | ||||
import io.swagger.annotations.ApiModel; | import io.swagger.annotations.ApiModel; | ||||
import lombok.*; | import lombok.*; | ||||
@@ -21,12 +21,12 @@ import java.io.Serializable; | |||||
@NoArgsConstructor | @NoArgsConstructor | ||||
@AllArgsConstructor | @AllArgsConstructor | ||||
@ToString | @ToString | ||||
public class ProjectDraftSaveDto implements Serializable { | |||||
public class ProjectDraftSaveDTO implements Serializable { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
@NotNull | @NotNull | ||||
private ProjectDto projectInfo; | |||||
private ProjectDTO projectInfo; | |||||
@NotNull | @NotNull | ||||
private ProcessInstanceUserDto user; | private ProcessInstanceUserDto user; |
@@ -29,7 +29,7 @@ import java.util.Map; | |||||
@Builder | @Builder | ||||
@NoArgsConstructor | @NoArgsConstructor | ||||
@AllArgsConstructor | @AllArgsConstructor | ||||
public class ProjectDraftVo implements Serializable { | |||||
public class ProjectDraftVO implements Serializable { | |||||
private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; | |||||
import com.ningdatech.basic.function.VUtils; | import com.ningdatech.basic.function.VUtils; | ||||
import com.ningdatech.pmapi.common.enumeration.ProjectProcessStageEnum; | import com.ningdatech.pmapi.common.enumeration.ProjectProcessStageEnum; | ||||
import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils; | import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils; | ||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.ConstructionPlanDto; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.ProjectConditionDto; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.ConstructionPlanDTO; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.ProjectConditionDTO; | |||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | ||||
import com.ningdatech.pmapi.projectlib.model.entity.Project; | import com.ningdatech.pmapi.projectlib.model.entity.Project; | ||||
import com.ningdatech.pmapi.projectlib.service.IProjectService; | import com.ningdatech.pmapi.projectlib.service.IProjectService; | ||||
@@ -50,7 +50,7 @@ public class ConstructionPlanManage { | |||||
* @param dto | * @param dto | ||||
* @return | * @return | ||||
*/ | */ | ||||
public String startTheProcess(ConstructionPlanDto dto) { | |||||
public String startTheProcess(ConstructionPlanDTO dto) { | |||||
Project projectInfo = projectService.getById(dto.getProjectId()); | Project projectInfo = projectService.getById(dto.getProjectId()); | ||||
VUtils.isTrue(Objects.isNull(projectInfo)).throwMessage("提交失败 此项目不存在!"); | VUtils.isTrue(Objects.isNull(projectInfo)).throwMessage("提交失败 此项目不存在!"); | ||||
@@ -77,7 +77,7 @@ public class ConstructionPlanManage { | |||||
params.setUser(dto.getUser()); | params.setUser(dto.getUser()); | ||||
params.setProcessUsers(Collections.emptyMap()); | params.setProcessUsers(Collections.emptyMap()); | ||||
//放入条件判断的项目字段 | //放入条件判断的项目字段 | ||||
ProjectConditionDto conditionDto = new ProjectConditionDto(); | |||||
ProjectConditionDTO conditionDto = new ProjectConditionDTO(); | |||||
BeanUtils.copyProperties(projectInfo, conditionDto); | BeanUtils.copyProperties(projectInfo, conditionDto); | ||||
dto.getFormData().putAll( | dto.getFormData().putAll( | ||||
JSON.parseObject(JSON.toJSONString(conditionDto), new TypeReference<Map<String, Object>>() { | JSON.parseObject(JSON.toJSONString(conditionDto), new TypeReference<Map<String, Object>>() { | ||||
@@ -9,14 +9,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | |||||
import com.ningdatech.basic.model.PageVo; | import com.ningdatech.basic.model.PageVo; | ||||
import com.ningdatech.pmapi.common.enumeration.ProjectProcessStageEnum; | import com.ningdatech.pmapi.common.enumeration.ProjectProcessStageEnum; | ||||
import com.ningdatech.pmapi.projectdeclared.entity.ProjectDraft; | import com.ningdatech.pmapi.projectdeclared.entity.ProjectDraft; | ||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.DeclaredProjectDto; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.DeclaredProjectListParamDto; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.ProjectConditionDto; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.ProjectDraftSaveDto; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.vo.ProjectDraftVo; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.DeclaredProjectDTO; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.DeclaredProjectListParamDTO; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.ProjectConditionDTO; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.ProjectDraftSaveDTO; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.vo.ProjectDraftVO; | |||||
import com.ningdatech.pmapi.projectdeclared.service.IProjectDraftService; | import com.ningdatech.pmapi.projectdeclared.service.IProjectDraftService; | ||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | 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.service.IProjectApplicationService; | import com.ningdatech.pmapi.projectlib.service.IProjectApplicationService; | ||||
@@ -60,7 +60,7 @@ public class DeclaredProjectManage { | |||||
private final ProcessModelService processModelService; | private final ProcessModelService processModelService; | ||||
public PageVo<ProjectDraftVo> pageDraft(DeclaredProjectListParamDto params) { | |||||
public PageVo<ProjectDraftVO> pageDraft(DeclaredProjectListParamDTO params) { | |||||
Page<ProjectDraft> page = params.page(); | Page<ProjectDraft> page = params.page(); | ||||
LambdaQueryWrapper<ProjectDraft> wrapper = Wrappers.lambdaQuery(ProjectDraft.class) | LambdaQueryWrapper<ProjectDraft> wrapper = Wrappers.lambdaQuery(ProjectDraft.class) | ||||
.eq(ProjectDraft::getUserId,params.getUserId()) | .eq(ProjectDraft::getUserId,params.getUserId()) | ||||
@@ -76,17 +76,17 @@ public class DeclaredProjectManage { | |||||
if (0L == page.getTotal()) { | if (0L == page.getTotal()) { | ||||
return PageVo.empty(); | return PageVo.empty(); | ||||
} | } | ||||
List<ProjectDraftVo> res = page.getRecords().stream().map(record -> { | |||||
ProjectDraftVo vo = new ProjectDraftVo(); | |||||
List<ProjectDraftVO> res = page.getRecords().stream().map(record -> { | |||||
ProjectDraftVO vo = new ProjectDraftVO(); | |||||
BeanUtils.copyProperties(record, vo); | BeanUtils.copyProperties(record, vo); | ||||
return vo; | return vo; | ||||
}).collect(Collectors.toList()); | }).collect(Collectors.toList()); | ||||
return PageVo.of(res, page.getTotal()); | return PageVo.of(res, page.getTotal()); | ||||
} | } | ||||
public ProjectDraftVo draftDatail(Long id) { | |||||
public ProjectDraftVO draftDatail(Long id) { | |||||
ProjectDraft draft = projectDraftService.getById(id); | ProjectDraft draft = projectDraftService.getById(id); | ||||
ProjectDraftVo vo = new ProjectDraftVo(); | |||||
ProjectDraftVO vo = new ProjectDraftVO(); | |||||
BeanUtils.copyProperties(draft, vo); | BeanUtils.copyProperties(draft, vo); | ||||
if(StringUtils.isNotBlank(draft.getProjectApplicationList())){ | if(StringUtils.isNotBlank(draft.getProjectApplicationList())){ | ||||
vo.setApplicationList(JSON.parseArray(draft.getProjectApplicationList(),ProjectApplication.class)); | vo.setApplicationList(JSON.parseArray(draft.getProjectApplicationList(),ProjectApplication.class)); | ||||
@@ -103,8 +103,8 @@ public class DeclaredProjectManage { | |||||
* @param dto | * @param dto | ||||
* @return | * @return | ||||
*/ | */ | ||||
public String startTheProcess(DeclaredProjectDto dto) { | |||||
ProjectDto projectInfo = dto.getProjectInfo(); | |||||
public String startTheProcess(DeclaredProjectDTO dto) { | |||||
ProjectDTO projectInfo = dto.getProjectInfo(); | |||||
String regionCode = projectInfo.getAreaCode(); | String regionCode = projectInfo.getAreaCode(); | ||||
WflowModels model = processModelService.getOne(Wrappers.lambdaQuery(WflowModels.class) | WflowModels model = processModelService.getOne(Wrappers.lambdaQuery(WflowModels.class) | ||||
@@ -121,7 +121,7 @@ public class DeclaredProjectManage { | |||||
params.setUser(dto.getUser()); | params.setUser(dto.getUser()); | ||||
params.setProcessUsers(Collections.emptyMap()); | params.setProcessUsers(Collections.emptyMap()); | ||||
//放入条件判断的项目字段 | //放入条件判断的项目字段 | ||||
ProjectConditionDto conditionDto = new ProjectConditionDto(); | |||||
ProjectConditionDTO conditionDto = new ProjectConditionDTO(); | |||||
BeanUtils.copyProperties(dto.getProjectInfo(), conditionDto); | BeanUtils.copyProperties(dto.getProjectInfo(), conditionDto); | ||||
if (Objects.nonNull(conditionDto)) { | if (Objects.nonNull(conditionDto)) { | ||||
dto.getFormData().putAll( | dto.getFormData().putAll( | ||||
@@ -145,7 +145,7 @@ public class DeclaredProjectManage { | |||||
* @param projectDto | * @param projectDto | ||||
* @param instanceId | * @param instanceId | ||||
*/ | */ | ||||
private void saveProject(ProjectDto projectDto, String instanceId, String regionCode) { | |||||
private void saveProject(ProjectDTO projectDto, String instanceId, String regionCode) { | |||||
//流程启动之后 入库项目 重要业务信息 用于列表查询 展示 | //流程启动之后 入库项目 重要业务信息 用于列表查询 展示 | ||||
try { | try { | ||||
//保存项目表信息 | //保存项目表信息 | ||||
@@ -180,8 +180,8 @@ public class DeclaredProjectManage { | |||||
* @param dto | * @param dto | ||||
* @return | * @return | ||||
*/ | */ | ||||
public Long saveToDraft(ProjectDraftSaveDto dto) { | |||||
ProjectDto projectInfo = dto.getProjectInfo(); | |||||
public Long saveToDraft(ProjectDraftSaveDTO dto) { | |||||
ProjectDTO projectInfo = dto.getProjectInfo(); | |||||
ProjectDraft draft = new ProjectDraft(); | ProjectDraft draft = new ProjectDraft(); | ||||
BeanUtils.copyProperties(projectInfo, draft); | BeanUtils.copyProperties(projectInfo, draft); | ||||
draft.setUserId(dto.getUser().getUserId()); | draft.setUserId(dto.getUser().getUserId()); | ||||
@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; | |||||
import com.ningdatech.basic.function.VUtils; | import com.ningdatech.basic.function.VUtils; | ||||
import com.ningdatech.pmapi.common.enumeration.ProjectProcessStageEnum; | import com.ningdatech.pmapi.common.enumeration.ProjectProcessStageEnum; | ||||
import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils; | import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils; | ||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.PreDeclaredProjectDto; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.ProjectConditionDto; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.PreDeclaredProjectDTO; | |||||
import com.ningdatech.pmapi.projectdeclared.entity.dto.ProjectConditionDTO; | |||||
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; | ||||
import com.ningdatech.pmapi.projectlib.model.entity.Project; | import com.ningdatech.pmapi.projectlib.model.entity.Project; | ||||
import com.ningdatech.pmapi.projectlib.service.IProjectService; | import com.ningdatech.pmapi.projectlib.service.IProjectService; | ||||
@@ -51,7 +51,7 @@ public class PrequalificationDeclaredProjectManage { | |||||
* @param dto | * @param dto | ||||
* @return | * @return | ||||
*/ | */ | ||||
public String startTheProcess(PreDeclaredProjectDto dto) { | |||||
public String startTheProcess(PreDeclaredProjectDTO dto) { | |||||
Project projectInfo = projectService.getById(dto.getProjectId()); | Project projectInfo = projectService.getById(dto.getProjectId()); | ||||
VUtils.isTrue(Objects.isNull(projectInfo)).throwMessage("提交失败 此项目不存在!"); | VUtils.isTrue(Objects.isNull(projectInfo)).throwMessage("提交失败 此项目不存在!"); | ||||
@@ -78,7 +78,7 @@ public class PrequalificationDeclaredProjectManage { | |||||
params.setUser(dto.getUser()); | params.setUser(dto.getUser()); | ||||
params.setProcessUsers(Collections.emptyMap()); | params.setProcessUsers(Collections.emptyMap()); | ||||
//放入条件判断的项目字段 | //放入条件判断的项目字段 | ||||
ProjectConditionDto conditionDto = new ProjectConditionDto(); | |||||
ProjectConditionDTO conditionDto = new ProjectConditionDTO(); | |||||
BeanUtils.copyProperties(projectInfo, conditionDto); | BeanUtils.copyProperties(projectInfo, conditionDto); | ||||
if (Objects.nonNull(conditionDto)) { | if (Objects.nonNull(conditionDto)) { | ||||
dto.getFormData().putAll( | dto.getFormData().putAll( | ||||