更改--查看项目详情字段赋值错误

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -245,10 +245,8 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             PmDemandResVo vo = new PmDemandResVo();
             vo.setProjectName(pmDemand.getProjectName());
             vo.setDemandId(demandId);
+            BeanUtils.copyProperties(pmDemand, vo);
             if ("1".equals(detailType)) { //项目计划
-
-                BeanUtils.copyProperties(pmDemand, vo);
-
                 //project_type,evaluation 从原来计划里取
                 ProvisionalPlan provisionalPlan = provisionalPlanMapper.seletById(pmDemand.getPlanId());
                 if (provisionalPlan != null) {
@@ -308,15 +306,6 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                     }
                 }
 
-                //项目状态
-                for (PmProjectStatus value : PmProjectStatus.values()) {
-                    if (vo.getProjectStatus() != null && vo.getProjectStatus().equals(value.getCode())) {
-                        vo.setProjectStatusName(value.getInfo());
-                        break;
-                    }
-                }
-
-
             } else if ("2".equals(detailType)) { //需求建档
 
                 //采购需求审核文件
@@ -383,7 +372,13 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                 }
 
             }
-
+            //项目状态
+            for (PmProjectStatus value : PmProjectStatus.values()) {
+                if (vo.getProjectStatus() != null && vo.getProjectStatus().equals(value.getCode())) {
+                    vo.setProjectStatusName(value.getInfo());
+                    break;
+                }
+            }
             return vo;
         } else {
             return null;