安全检查 待办和 列表 折叠显示

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/panel/vo/PanelListVo.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class PanelListVo {
@@ -40,5 +41,9 @@ public class PanelListVo {
     @ApiModelProperty(value = "是否存在监控",notes = "0不存在1存在")
     private Integer isExist;
 
+    @ApiModelProperty(value = "同名任务分组",notes = "仅安全检查使用该字段")
+    private List<PanelListVo> uncompleted;
 
+    @ApiModelProperty(value = "面板功能名称")
+    private String beCheckedOrgName;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/panel/service/impl/PanelServiceImpl.java

@@ -37,6 +37,7 @@ import com.xunmei.system.api.RemoteUserService;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -178,7 +179,29 @@ public class PanelServiceImpl implements PanelService {
             List<PanelListVo> data = map.getValue();
             vo.setNums(data.size());
             vo.setTaskTypeText(PanelTypeEnums.getName(map.getKey()));
-            vo.setDataList(data);
+            if(ObjectUtil.equal(map.getKey(),PanelTypeEnums.SAFETY_CHECK.getCode())){
+                if(data.size()>0)
+                {
+                    Map<String, List<PanelListVo>> groupedItems = data.stream()
+                            .collect(Collectors.groupingBy(PanelListVo::getTaskName));
+                    List<PanelListVo> tempData=new ArrayList<>();
+
+                    for (Map.Entry<String, List<PanelListVo>> entry : groupedItems.entrySet()) {
+                        PanelListVo parentItem=new PanelListVo();
+                        BeanUtils.copyProperties(entry.getValue().get(0),parentItem);
+                        parentItem.setUncompleted(entry.getValue());
+                        tempData.add(parentItem);
+                    }
+                    vo.setDataList(tempData);
+                }
+                else {
+                    vo.setDataList(data);
+                }
+            }
+            else {
+
+                vo.setDataList(data);
+            }
             list.add(vo);
         }
 

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -888,7 +888,7 @@
     </select>
 
     <select id="selectCurUserTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
-        select distinct t.id as id, title as taskName,t.plan_start_time as startTime,t.plan_end_time as endTime,t.status
+        select distinct t.id as id, title as taskName,t.plan_start_time as startTime,t.plan_end_time as endTime,t.status,t.org_name as beCheckedOrgName
         from core_safety_task t
         where (t.grant_user_id = #{request.userId} or ( t.check_org_id =#{request.orgId}
         and t.plan_id in (select id from core_safecheck_plan p