项目相关实体

src/main/java/com/migao/entity/po/Project.java

@@ -77,6 +77,9 @@ public class Project implements Serializable {
     @Column(name = "order_status", columnDefinition = "varchar(255) comment '下达状态'")
     private String orderStatus;
 
+    @Column(name = "purchase_status", columnDefinition = "varchar(255) comment '采购审批状态'")
+    private String purchaseStatus;
+
 
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @Column(name = "deleted", columnDefinition = "tinyint(4) comment '逻辑删除 0未删除 1已删除'")

src/main/java/com/migao/service/impl/ProjectServiceImpl.java

@@ -292,7 +292,8 @@ public class ProjectServiceImpl implements ProjectService {
         Project save = projectRepository.save(project);
 
         //更新项目下达状态
-        parProject.setOrderStatus(ProjectStatus.TO_BE_REPORTED.getName());
+        project.setOrderStatus(ProjectStatus.APPROVE.getName());
+        parProject.setPurchaseStatus(ProjectStatus.TO_BE_REPORTED.getName());
         projectMapper.updateById(parProject);
         //关联里程碑
         Integer milestoneId = subProjectInsertReq.getMilestoneId();

src/main/java/com/migao/service/impl/PurchasingApprovalServiceImpl.java

@@ -105,7 +105,7 @@ public class PurchasingApprovalServiceImpl extends ServiceImpl<PurchasingApprova
             projectDemandMapper.insert(projectDemand);
         }
         //更新项目状态
-        project.setOrderStatus(ProjectStatus.TO_APPROVAL.getName());
+        project.setPurchaseStatus(ProjectStatus.TO_APPROVAL.getName());
         projectMapper.updateById(project);
         //新增采购记录
         PurchasingApproval purchasingApproval=new PurchasingApproval();
@@ -123,7 +123,7 @@ public class PurchasingApprovalServiceImpl extends ServiceImpl<PurchasingApprova
         if (project == null) {
             ResponseBuilder.fail("项目不存在");
         }
-        project.setOrderStatus(ProjectStatus.APPROVE.getName());
+        project.setPurchaseStatus(ProjectStatus.APPROVE.getName());
         projectMapper.updateById(project);
         //新增采购记录
         PurchasingApproval purchasingApproval=new PurchasingApproval();
@@ -141,7 +141,7 @@ public class PurchasingApprovalServiceImpl extends ServiceImpl<PurchasingApprova
         if (project == null) {
             ResponseBuilder.fail("项目不存在");
         }
-        project.setOrderStatus(ProjectStatus.TO_BE_REPORTED.getName());
+        project.setPurchaseStatus(ProjectStatus.TO_BE_REPORTED.getName());
         projectMapper.updateById(project);
         return ResponseBuilder.ok();
     }
@@ -152,7 +152,7 @@ public class PurchasingApprovalServiceImpl extends ServiceImpl<PurchasingApprova
         if (project == null) {
             ResponseBuilder.fail("项目不存在");
         }
-        project.setOrderStatus(ProjectStatus.HAS_ORDERED.getName());
+        project.setPurchaseStatus(ProjectStatus.HAS_ORDERED.getName());
         projectMapper.updateById(project);
         PurchasingApproval purchasingApproval = PurchasingApproval.builder()
                 .deleted(0)