Browse Source

逻辑修改

master
zxc 5 years ago
parent
commit
0a174b88a7
  1. 5
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java
  2. 2
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

5
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java

@ -70,6 +70,11 @@ public class ProjectDetailResultDTO implements Serializable {
*/ */
private List<String> platformIds; private List<String> platformIds;
public ProjectDetailResultDTO() {
this.processable = false;
this.isSend = false;
}
@NoArgsConstructor @NoArgsConstructor
@Data @Data
public static class DepartmentNameListBean { public static class DepartmentNameListBean {

2
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@ -310,6 +310,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
if (null != departmentList && departmentList.size() > NumConstant.ZERO) { if (null != departmentList && departmentList.size() > NumConstant.ZERO) {
//TODO external_system值为1时,根据departmentList里的projectStaffId在project_sub_process表找最新的一条记录, //TODO external_system值为1时,根据departmentList里的projectStaffId在project_sub_process表找最新的一条记录,
// 如果没有记录或者INTERNAL_STATUS是closed,processable的值为true // 如果没有记录或者INTERNAL_STATUS是closed,processable的值为true
if (StringUtils.isNotEmpty(parameterValue)){
if (parameterValue.equals(NumConstant.ONE_STR)) { if (parameterValue.equals(NumConstant.ONE_STR)) {
List<String> projectStaffIds = departmentList.stream().map(m -> m.getProjectStaffId()).distinct().collect(Collectors.toList()); List<String> projectStaffIds = departmentList.stream().map(m -> m.getProjectStaffId()).distinct().collect(Collectors.toList());
// 根据departmentList里的projectStaffId在project_sub_process表找最新的一条记录 // 根据departmentList里的projectStaffId在project_sub_process表找最新的一条记录
@ -325,6 +326,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
resultDTO.setProcessable(true); resultDTO.setProcessable(true);
resultDTO.setIsSend(false); resultDTO.setIsSend(false);
} }
}
} else { } else {
resultDTO.setProcessable(false); resultDTO.setProcessable(false);
} }

Loading…
Cancel
Save