实施管理修改

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/OperationManage.java

@@ -107,9 +107,6 @@ public class OperationManage {
         }
         // 修改标段状态
         tenderStateMachineUtil.pass(purchase);
-        purchase.setSelfTestStatus(TenderSelfTestStatusEnum.WITHOUT_SELF_TEST_INFO.getCode());
-        purchase.setTestValidStatus(TenderTestValidStatusEnum.WITHOUT_TEST_VALID_INFO.getCode());
-        purchase.setAdaptStatus(TenderAdaptStatusEnum.WITHOUT_ADAPT_INFO.getCode());
         purchaseService.updateById(purchase);
         return curr.getProjectCode();
     }

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java

@@ -369,6 +369,9 @@ public class PurchaseManage {
             if (purchase.getId() == null) {
                 purchase.setCreateBy(user.getUserIdStr());
             }
+            purchase.setSelfTestStatus(TenderSelfTestStatusEnum.WITHOUT_SELF_TEST_INFO.getCode());
+            purchase.setTestValidStatus(TenderTestValidStatusEnum.WITHOUT_TEST_VALID_INFO.getCode());
+            purchase.setAdaptStatus(TenderAdaptStatusEnum.WITHOUT_ADAPT_INFO.getCode());
             purchase.setStatus(TenderStatusEnum.TO_BE_SUBMIT_PURCHASE_INFO.getTenderStatus());
             notices.add(buildPurchaseNotice(w, user));
             return purchase;
@@ -499,10 +502,16 @@ public class PurchaseManage {
             });
         }
         List<Long> projectIds = CollUtils.fieldList(records, Purchase::getProjectId);
+        List<Project> projects = projectService.listByIds(projectIds);
+        Map<Long, Project> projectMap = CollUtils.listToMap(projects, Project::getId);
         Map<Long, Contract> contractMap = contractService.listByProjectIds(projectIds);
         List<TestValidListVO> data = records.stream().map(w -> {
             TestValidListVO item = new TestValidListVO();
             item.setBidId(w.getId());
+            Project project = projectMap.get(w.getProjectId());
+            if (project != null) {
+                item.setProjectName(project.getProjectName());
+            }
             item.setBizName(w.getBidName());
             item.setProjectId(w.getProjectId());
             String projectCode = ProjectIdCodeCacheUtil.get(w.getProjectId());

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/TestValidListVO.java

@@ -23,6 +23,9 @@ public class TestValidListVO {
     @ApiModelProperty("标段名称")
     private String bizName;
 
+    @ApiModelProperty("项目名称")
+    private String projectName;
+
     @ApiModelProperty("合同金额")
     private BigDecimal contractAmount;