From 097ec9007f5e10f6d2b5da917cc3b67e15a9ffca Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 18 May 2022 11:09:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=20=E6=97=B6=E9=97=B4=E8=BD=B4?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectStatusBoardController.java         |  2 +-
 .../entity/ProjectLawsInventoryEO.java        |  9 +++++++++
 .../project/entity/ProjectLibraryBase.java    |  6 ++++++
 .../xml/ProjectLawsInventoryEOMapper.xml      |  4 ++++
 .../service/IProjectStatusBoardService.java   |  2 +-
 .../impl/ProjectStatusBoardServiceImpl.java   | 20 ++++++++++++++++---
 .../impl/ProjectTaskPlanningServiceImpl.java  |  7 +++++++
 .../jero/modules/project/vo/TimeNodeVO.java   |  1 +
 8 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectStatusBoardController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectStatusBoardController.java
index fc8301c2e..c89f7390a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectStatusBoardController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectStatusBoardController.java
@@ -42,7 +42,7 @@ public class ProjectStatusBoardController {
     @ApiOperation(value="时间轴列表", notes="时间轴列表")
     @GetMapping(value = "/timelineList")
     public Result<?> timelineList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) {
-        List<List<TimeNodeVO>> result = iProjectStatusBoardService.timelineList(projectLibraryBase, req);
+        List<Map<String,Object>> result = iProjectStatusBoardService.timelineList(projectLibraryBase, req);
         if(result==null) {
             return Result.error("未找到对应数据");
         }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
index b074b424c..8671c67f1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
@@ -386,4 +386,13 @@ public class ProjectLawsInventoryEO implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "调取虚拟清单,虚拟清单中维护数据为空时,进行二次确认")
     private String flag;
+
+    //适用增补件
+    private String applicableSupplement;
+    //验证备注
+    private String verifyRemark;
+    //pre备注
+    private String prehomoRemark;
+    //设计备注
+    private String designRemark;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
index b521d4bc8..cb4a03da8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
@@ -95,4 +95,10 @@ public class ProjectLibraryBase implements Serializable {
     /**中英切换标志*/
     @TableField(exist = false)
     private String cut;
+
+    @TableField(exist = false)
+    private java.util.Date startTime;
+
+    @TableField(exist = false)
+    private java.util.Date endTime;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml
index 58ae4f5ac..26ff526bf 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml
@@ -40,6 +40,10 @@
         <result column="verify_duty" property="verifyDuty" />
         <result column="verify_due_date" property="verifyDueDate" />
         <result column="region" property="region" />
+        <result column="applicable_supplement" property="applicableSupplement" />
+        <result column="verify_remark" property="verifyRemark" />
+        <result column="prehomo_remark" property="prehomoRemark" />
+        <result column="design_remark" property="designRemark" />
     </resultMap>
 
     <select id="getlistingToConfirmStatistics" resultType="hashmap">
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectStatusBoardService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectStatusBoardService.java
index dab8c8e35..72cafbeda 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectStatusBoardService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectStatusBoardService.java
@@ -21,7 +21,7 @@ public interface IProjectStatusBoardService {
      * @param req
      * @return
      */
-    List<List<TimeNodeVO>> timelineList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req);
+    List<Map<String,Object>> timelineList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req);
 
     List<String> timeline(Date startTime, Date endTime);
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
index 1d801d957..a138af04e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
@@ -61,19 +61,33 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
      * @return
      */
     @Override
-    public List<List<TimeNodeVO>> timelineList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) {
+    public List<Map<String,Object>> timelineList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) {
 
 //        QueryWrapper<ProjectLibraryBase> queryWrapper = QueryGenerator.initQueryWrapper(projectLibraryBase, req.getParameterMap());
 
         //项目库信息
         List<ProjectLibraryBase> projectLibraryBaseList = projectLibraryBaseService.getList(projectLibraryBase);
-        List<List<TimeNodeVO>> result = new ArrayList<>();
+        List<List<TimeNodeVO>> list = new ArrayList<>();
+        List<Map<String,Object>> result = new ArrayList<>();
+
         if(projectLibraryBaseList.size() != 0){
             //项目库id
             List<String> projectLibraryBaseIdList = projectLibraryBaseList.stream().map(ProjectLibraryBase::getId).collect(Collectors.toList());
 
             //时间轴数据
-            result = projectTaskPlanningService.queryByProjectId(StringUtils.join(projectLibraryBaseIdList, ","), projectLibraryBase.getCut());
+            int index = 0;
+            list = projectTaskPlanningService.queryByProjectId(StringUtils.join(projectLibraryBaseIdList, ","), projectLibraryBase.getCut());
+            for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
+                Map<String,Object> mapList = new HashMap<>();
+                List<List<TimeNodeVO>> collect = list.stream().filter(e -> libraryBase.getId().equals(e.get(0).getProjectId())).collect(Collectors.toList());
+                if(collect.size() != 0){
+                    index ++;
+                    mapList.put("index",index);
+                    mapList.put("projectName",libraryBase.getProjectName());
+                    mapList.put("data",collect);
+                    result.add(mapList);
+                }
+            }
         }
         return result;
     }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java
index 16ecab092..99faedd18 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java
@@ -125,6 +125,7 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 				}else{
 					listConfirmationVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
 				}
+				listConfirmationVO.setProjectId(projectTaskPlanning.getProjectId());
 				timeNodeVOS.add(listConfirmationVO);
 			}
 
@@ -145,6 +146,7 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 				}else {
 					legalTaskConfirmationVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
 				}
+				legalTaskConfirmationVO.setProjectId(projectTaskPlanning.getProjectId());
 				timeNodeVOS.add(legalTaskConfirmationVO);
 			}
 
@@ -165,6 +167,7 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 				}else{
 					designDeadlineVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
 				}
+				designDeadlineVO.setProjectId(projectTaskPlanning.getProjectId());
 				timeNodeVOS.add(designDeadlineVO);
 			}
 
@@ -185,6 +188,7 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 				}else{
 					prehomoDeadlineVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
 				}
+				prehomoDeadlineVO.setProjectId(projectTaskPlanning.getProjectId());
 				timeNodeVOS.add(prehomoDeadlineVO);
 			}
 
@@ -205,6 +209,7 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 				}else{
 					attestationStartTimeVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
 				}
+				attestationStartTimeVO.setProjectId(projectTaskPlanning.getProjectId());
 				timeNodeVOS.add(attestationStartTimeVO);
 			}
 			if(ObjectUtils.isNotEmpty(projectTaskPlanning.getAttestationEndTime())) {
@@ -224,6 +229,7 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 				}else{
 					attestationEndTimeVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
 				}
+				attestationEndTimeVO.setProjectId(projectTaskPlanning.getProjectId());
 				timeNodeVOS.add(attestationEndTimeVO);
 			}
 
@@ -244,6 +250,7 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 				}else{
 					verifyDeadlineVO.setStatus(PlanStatusEnum.ON_GOING.getValue());
 				}
+				verifyDeadlineVO.setProjectId(projectTaskPlanning.getProjectId());
 				timeNodeVOS.add(verifyDeadlineVO);
 			}
 			// 排序
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/TimeNodeVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/TimeNodeVO.java
index 080d0f9a1..43625d2c7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/TimeNodeVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/TimeNodeVO.java
@@ -10,6 +10,7 @@ public class TimeNodeVO implements Comparator<TimeNodeVO> {
     private String name;
     private Date time;
     private String status;
+    private String projectId;
 
     @Override
     public int compare(TimeNodeVO o1, TimeNodeVO o2) {