代码提交

ruoyi-admin/src/main/resources/application-prod.yml

@@ -45,6 +45,7 @@ spring:
       primary: master
       # 严格模式 匹配不到数据源则报错
       strict: true
+      strict: true
       datasource:
         # 主库数据源
         master:
@@ -52,15 +53,15 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://101.37.69.204:8001/demo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
           username: root
-          password: root
+          password: Mz!@#123
         # 从库数据源
         slave:
           lazy: true
           type: ${spring.datasource.type}
           driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://101.37.69.204:8001/demo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
           username:
           password:
 #        oracle:

ruoyi-demo/src/main/java/com/ruoyi/mts/domain/MesPlanDetail.java

@@ -31,6 +31,10 @@ public class MesPlanDetail extends TreeEntity<MesPlanDetail> {
      */
     @TableId(value = "id")
     private Long id;
+    /**
+     * 祖级列表
+     */
+    private String ancestors;
     /**
      * 主表id
      */

ruoyi-demo/src/main/java/com/ruoyi/mts/domain/bo/MesPlanDetailBo.java

@@ -31,6 +31,11 @@ public class MesPlanDetailBo extends TreeEntity<MesPlanDetailBo> {
     @NotNull(message = "主键不能为空", groups = {EditGroup.class})
     private Long id;
 
+    /**
+     * 祖级列表
+     */
+    private String ancestors;
+
     /**
      * 主表id
      */

ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/AncestorsVO.java

@@ -0,0 +1,10 @@
+package com.ruoyi.mts.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class AncestorsVO {
+    private Long id;
+    private String ancestors;
+    private Integer len;
+}

ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanDetailVo.java

@@ -9,6 +9,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
 import lombok.Data;
+import org.apache.http.ssl.PrivateKeyStrategy;
 
 import java.util.Date;
 
@@ -38,6 +39,11 @@ public class MesPlanDetailVo implements Serializable {
     @ExcelProperty(value = "父id")
     private Long parentId;
 
+    /**
+     * 祖级列表
+     */
+    private String ancestors;
+
     /**
      * 主表id
      */

ruoyi-demo/src/main/java/com/ruoyi/mts/mapper/MesPlanDetailMapper.java

@@ -2,9 +2,11 @@ package com.ruoyi.mts.mapper;
 
 import com.ruoyi.mts.domain.MesPlanDetail;
 import com.ruoyi.mts.domain.bo.MesPlanDetailBo;
+import com.ruoyi.mts.domain.vo.AncestorsVO;
 import com.ruoyi.mts.domain.vo.GanttVO;
 import com.ruoyi.mts.domain.vo.MesPlanDetailVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
@@ -14,7 +16,10 @@ import java.util.List;
  * @author jiangzhe
  * @date 2024-02-19
  */
+@Mapper
 public interface MesPlanDetailMapper extends BaseMapperPlus<MesPlanDetailMapper, MesPlanDetail, MesPlanDetailVo> {
 
     List<GanttVO> queryGanttList(MesPlanDetailBo bo);
+
+    AncestorsVO findMaxAncestors();
 }

ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanDetailServiceImpl.java

@@ -1,9 +1,13 @@
 package com.ruoyi.mts.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.ruoyi.common.core.domain.TreeEntity;
 import com.ruoyi.common.utils.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.mts.domain.vo.AncestorsVO;
 import com.ruoyi.mts.domain.vo.GanttVO;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -13,9 +17,7 @@ import com.ruoyi.mts.domain.MesPlanDetail;
 import com.ruoyi.mts.mapper.MesPlanDetailMapper;
 import com.ruoyi.mts.service.IMesPlanDetailService;
 
-import java.util.List;
+import java.util.*;
-import java.util.Map;
-import java.util.Collection;
 
 /**
  * 生产计划明细Service业务层处理
@@ -29,6 +31,8 @@ public class MesPlanDetailServiceImpl implements IMesPlanDetailService {
 
     private final MesPlanDetailMapper baseMapper;
 
+    public static final String TAB_PREFIX = "    ";
+
     /**
      * 查询生产计划明细
      */
@@ -43,8 +47,22 @@ public class MesPlanDetailServiceImpl implements IMesPlanDetailService {
      */
     @Override
     public List<MesPlanDetailVo> queryList(MesPlanDetailBo bo) {
+        bo.setParentId(0L);
         LambdaQueryWrapper<MesPlanDetail> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        List<MesPlanDetailVo> list = baseMapper.selectVoList(lqw);
+
+        LinkedList<MesPlanDetailVo> res = new LinkedList<>();
+        for (int i = 0; i < list.size(); i++) {
+            MesPlanDetailVo vo = list.get(i);
+            res.add(vo);
+
+            LambdaQueryWrapper<MesPlanDetail> voLqw = Wrappers.lambdaQuery(MesPlanDetail.class).eq(TreeEntity::getParentId, vo.getId()).orderByAsc(MesPlanDetail::getId);
+            List<MesPlanDetailVo> children = baseMapper.selectVoList(voLqw);
+            if (CollUtil.isNotEmpty(children)) {
+                res.addAll(i + 1, children);
+            }
+        }
+        return res;
     }
 
     /**
@@ -63,6 +81,7 @@ public class MesPlanDetailServiceImpl implements IMesPlanDetailService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<MesPlanDetail> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getParentId() != null, MesPlanDetail::getParentId, bo.getParentId());
+        lqw.eq(bo.getAncestors() != null, MesPlanDetail::getAncestors, bo.getAncestors());
         lqw.eq(bo.getMainId() != null, MesPlanDetail::getMainId, bo.getMainId());
         lqw.like(StringUtils.isNotBlank(bo.getName()), MesPlanDetail::getName, bo.getName());
         lqw.eq(bo.getPlanStartDate() != null, MesPlanDetail::getPlanStartDate, bo.getPlanStartDate());

ruoyi-demo/src/main/resources/mapper/mts/MesPlanDetailMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.ruoyi.mts.domain.MesPlanDetail" id="MesPlanDetailResult">
         <result property="id" column="id"/>
         <result property="parentId" column="parent_id"/>
+        <result property="ancestors" column="ancestors"/>
         <result property="mainId" column="main_id"/>
         <result property="name" column="name"/>
         <result property="planStartDate" column="plan_start_date"/>
@@ -27,5 +28,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM mes_plan_detail t WHERE t.main_id=#{mainId}
     </select>
 
+    <select id="findMaxAncestors" resultType="com.ruoyi.mts.domain.vo.AncestorsVO">
+        SELECT t.id,t.ancestors, LENGTH(t.ancestors) len
+        FROM mes_plan_detail t
+        ORDER BY len DESC
+            LIMIT 1
+    </select>
+
 
 </mapper>

ruoyi-ui-vue3/src/views/mts/planDetail/index.vue

@@ -30,11 +30,14 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-if="refreshTable" v-loading="loading" :data="planDetailList" row-key="id" height="700"
+    <el-table v-if="refreshTable" v-loading="loading" :data="planDetailList" row-key="id" height="800"
-      :default-expand-all="isExpandAll" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+      :default-expand-all="isExpandAll" :span-method="objectSpanMethod" :cell-style="handleChangeCellStyle">
-      :cell-style="handleChangeCellStyle">
       <el-table-column fixed="left" label="名称" align="left" prop="name" width="180">
         <template #default="scope">
+          <span v-html="handleName(scope.row)"></span>
+          {{ scope.row.name }}
+        </template>
+        <!-- <template #default="scope">
           <el-dropdown>
             <span class="el-dropdown-link">
               {{ scope.row.name }}
@@ -53,6 +56,11 @@
               </el-dropdown-menu>
             </template>
           </el-dropdown>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="计划/实际" align="center" prop="flag" width="80">
+        <template #default="scope">
+          <span>{{ scope.rowIndex % 2 === 0 ? '实际' : '计划' }}</span>
         </template>
       </el-table-column>
       <!-- <el-table-column label="计划时间" align="center" prop="planDate" width="180">
@@ -258,11 +266,45 @@ function handleChangeCellStyle({ row, column, rowIndex, columnIndex }) {
   return cellStyle
 }
 
+const nbsp = "&nbsp;&nbsp;&nbsp;&nbsp;"
+function handleName(row) {
+  let res = ''
+  let arr = row.ancestors.split(',')
+  if (arr.length > 1) {
+    for (let i = 1; i < arr.length; i++) {
+      res = res + nbsp
+    }
+  }
+  return res
+}
+
+const objectSpanMethod = ({
+  row,
+  column,
+  rowIndex,
+  columnIndex,
+}) => {
+  if (columnIndex === 0) {
+    if (rowIndex % 2 === 0) {
+      return {
+        rowspan: 2,
+        colspan: 1,
+      }
+    } else {
+      return {
+        rowspan: 0,
+        colspan: 0,
+      }
+    }
+  }
+}
+
 /** 查询生产计划明细列表 */
 function getList() {
   loading.value = true;
   listPlanDetail(queryParams.value).then(response => {
-    planDetailList.value = proxy.handleTree(response.data, "id", "parentId");
+    // planDetailList.value = proxy.handleTree(response.data, "id", "parentId");
+    planDetailList.value = response.data
     loading.value = false;
   });
 }