ソースを参照

ProjectVO添加区域管理与名称

xuexiaobo 6 年 前
コミット
e399063b89

+ 1 - 2
site/src/main/java/com/mooctest/crowd/site/data/vo/CrowdProjectVO.java

@@ -33,7 +33,7 @@ public class CrowdProjectVO {
     private String file;
     private Long resource;
     private Map<String, String> location;
-    private Long institution;
+    private String institution;
     private Timestamp datetime;
     private Double price;
     private Double budget;
@@ -53,7 +53,6 @@ public class CrowdProjectVO {
         this.location = new HashMap<>();
         this.location.put("provinceCode", project.getDistributionProvince());
         this.location.put("cityCode", project.getDistributionCity());
-        this.institution = project.getRegionalManagerId();
         this.datetime = project.getDeadTime();
         this.budget = project.getQuotedPrice();
         this.price = project.getFixedPrice();

+ 4 - 1
site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -166,7 +166,10 @@ public class WebMediatorImpl implements ViewMediator {
             reportVOList = new ArrayList<>();
             reportVOList.add(new CrowdReportVO(project.getCrowdTestReportForProject()));
         }
-        projectDetailsDTO.setProjectDetails(new CrowdProjectVO(project));
+        CrowdProjectVO projectVO = new CrowdProjectVO(project);
+        Optional<UserPO> regionManager = userDao.findById(project.getRegionalManagerId());
+        projectVO.setInstitution(regionManager.isPresent()?regionManager.get().getName():"区域管理员已注销");
+        projectDetailsDTO.setProjectDetails(projectVO);
         projectDetailsDTO.setTaskList(taskVOList);
         projectDetailsDTO.setReportList(reportVOList);
         return projectDetailsDTO;