检查计划列表取消树结构

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/domain/CoreSafecheckPlan.java

@@ -47,9 +47,9 @@ public class CoreSafecheckPlan extends BaseEntity {
     @TableField(exist = false)
     @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
-    @TableField(exist = false)
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long index;
+//    @TableField(exist = false)
+//    @JsonSerialize(using = ToStringSerializer.class)
+//    private Long index;
 
     /**
      * 计划名称
@@ -209,8 +209,8 @@ public class CoreSafecheckPlan extends BaseEntity {
      */
     @ApiModelProperty(value = "修改人id")
     private Long modifiedBy;
-    @TableField(exist = false)
-    private List<CoreSafecheckPlan> children;
+//    @TableField(exist = false)
+//    private List<CoreSafecheckPlan> children;
     /**
      * 数据来源 0：检查计划 ，1：登记检查结果
      */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafecheckPlanServiceImpl.java

@@ -72,22 +72,22 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
         page = coreSafecheckPlanMapper.selectCoreSafecheckPlanPage(page, coreSafecheckPlan);
 
 
-        coreSafecheckPlan.setParentIds(page.getRecords().stream().map(CoreSafecheckPlan::getId).collect(Collectors.toList()));
-        List<CoreSafecheckPlan> allChildren = new ArrayList<>();
-        if (CollectionUtil.isNotEmpty(coreSafecheckPlan.getParentIds())) {
-            allChildren = baseMapper.selectChildren(coreSafecheckPlan);
-        }
-        Long order = ((coreSafecheckPlan.getPageNum() - 1) * coreSafecheckPlan.getPageSize()) + 1;
-        for (CoreSafecheckPlan r : page.getRecords()) {
-            r.setIndex(order++);
-            Long childOrder = 1L;
-            List<CoreSafecheckPlan> children = allChildren.stream().filter(c -> ObjectUtil.equal(c.getParentId(), r.getId())).collect(Collectors.toList());
-            for (CoreSafecheckPlan child : children) {
-
-                child.setIndex(childOrder++);
-            }
-            r.setChildren(children);
-        }
+//        coreSafecheckPlan.setParentIds(page.getRecords().stream().map(CoreSafecheckPlan::getId).collect(Collectors.toList()));
+//        List<CoreSafecheckPlan> allChildren = new ArrayList<>();
+//        if (CollectionUtil.isNotEmpty(coreSafecheckPlan.getParentIds())) {
+//            allChildren = baseMapper.selectChildren(coreSafecheckPlan);
+//        }
+//        Long order = ((coreSafecheckPlan.getPageNum() - 1) * coreSafecheckPlan.getPageSize()) + 1;
+//        for (CoreSafecheckPlan r : page.getRecords()) {
+//            r.setIndex(order++);
+//            Long childOrder = 1L;
+//            List<CoreSafecheckPlan> children = allChildren.stream().filter(c -> ObjectUtil.equal(c.getParentId(), r.getId())).collect(Collectors.toList());
+//            for (CoreSafecheckPlan child : children) {
+//
+//                child.setIndex(childOrder++);
+//            }
+//            r.setChildren(children);
+//        }
         //抓换为TableDataInfo适配前端
         return TableDataInfo.build(page);
 

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

@@ -248,32 +248,14 @@
         <if test="check.checkRole != null and check.checkRole != ''">
             and r.id = #{check.checkRole}
         </if>
-        ) tem
-        where 1=1
-
-        and tem.id in (
-        select id from core_safecheck_plan
-        where 1=1
         <if test="check.checkSub==false">
-            and plan_of_org_id=#{check.orgId}
+            and c.plan_of_org_id=#{check.orgId}
         </if>
         <if test="check.checkSub==true">
-            and plan_of_org_id in (select id from sys_org
+            and c.plan_of_org_id in (select id from sys_org
             where path like concat((select path from sys_org where id=#{check.orgId}),'%'))
         </if>
-        and parent_id not in (select id from core_safecheck_plan
-        where 1=1
-        <if test="check.checkSub==false">
-            and plan_of_org_id=#{check.orgId}
-        </if>
-        <if test="check.checkSub==true">
-            and plan_of_org_id in (select id from sys_org
-            where path like concat((select path from sys_org where id=#{check.orgId}),'%'))
-        </if>)
-        )
-
-
-
+        ) tem
         GROUP BY tem.id
     </select>
     <select id="selectItemIdsByPlanId" resultType="java.lang.String">