Browse Source

modify:

1. 招标采购修改;
tags/24102401
WendyYang 1 month ago
parent
commit
4c02fd4abd
2 changed files with 2 additions and 7 deletions
  1. +1
    -7
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/DeclaredProjectManage.java
  2. +1
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java

+ 1
- 7
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/DeclaredProjectManage.java View File

@@ -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())


+ 1
- 0
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java View File

@@ -649,6 +649,7 @@ public class PurchaseManage {
List<Purchase> purchases = purchaseService.list(select);
if (CollUtil.allMatch(purchases, w -> StrUtil.isNotBlank(w.getSupplier()))) {
projectStateMachineUtil.pass(project);
projectService.updateById(project);
projectStatusRewriteHandlerContext.process(purchase, project, purchases);
} else {
projectService.updateById(project);


Loading…
Cancel
Save