|
|
@@ -173,13 +173,6 @@ public class DeclaredProjectManage { |
|
|
|
reqProj.setSuperOrg(user.getMhUnitName()); |
|
|
|
} |
|
|
|
|
|
|
|
//如果是重新提交的话 判断下 项目是否存在 |
|
|
|
if (Objects.nonNull(reqProj.getId())) { |
|
|
|
//新申报的项目不允许带项目id |
|
|
|
reqProj.setId(null); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
ProcessStartParamsVo params = new ProcessStartParamsVo(); |
|
|
|
params.setUser(declaredProjectHelper.buildUser(user)); |
|
|
|
params.setProcessUsers(Collections.emptyMap()); |
|
|
@@ -446,6 +439,7 @@ public class DeclaredProjectManage { |
|
|
|
} |
|
|
|
List<ProjectLibListItemVO> records = CollUtils.convert(page.getRecords(), w -> { |
|
|
|
ProjectLibListItemVO item = BeanUtil.copyProperties(w, ProjectLibListItemVO.class); |
|
|
|
item.setDeclaredAmount(w.getDeclareAmount()); |
|
|
|
if (!ProjectStatus.TO_BE_DECLARED.eq(w.getStatus()) |
|
|
|
&& ProjectStatus.COMPLIANCE_REVIEW_FAILED.eq(w.getStatus()) |
|
|
|
&& ProjectStatus.ON_COMPLIANCE_REVIEW.eq(w.getStatus()) |
|
|
|