库存导入bug修复，外貌重构初步

ruoyi-oa/src/main/resources/mapper/oa/OaProgressMapper.xml

@@ -4,24 +4,118 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.oa.mapper.OaProgressMapper">
 
-    <resultMap type="com.ruoyi.oa.domain.OaProgress" id="OaProgressResult">
-        <result property="progressId" column="progress_id"/>
-        <result property="projectId" column="project_id"/>
-        <result property="type" column="type"/>
+    <!-- 1. 定义 OaProgressVo 的映射：同时嵌套子阶段和子任务 -->
+    <resultMap id="OaProgressResult" type="com.ruoyi.oa.domain.vo.OaProgressVo">
+        <id     property="progressId"   column="progress_id"/>
+        <result property="projectId"    column="project_id"/>
+        <result property="type"         column="type"/>
         <result property="progressName" column="progress_name"/>
-        <result property="parentId" column="parent_id"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="sort" column="sort"/>
-        <result property="remark" column="remark"/>
-        <result property="status" column="status"/>
-        <result property="timeRemark" column="time_remark"/>
+        <result property="parentId"     column="parent_id"/>
+        <result property="sort"         column="sort"/>
+        <result property="remark"       column="remark"/>
+        <result property="status"       column="status"/>
+        <result property="timeRemark"   column="time_remark"/>
         <result property="contactPhone" column="contact_phone"/>
+
+        <!-- 嵌套查询一级或二级子阶段 -->
+        <collection property="children"
+                    ofType="com.ruoyi.oa.domain.vo.OaProgressVo"
+                    javaType="list"
+                    select="queryByParentId"
+                    column="progress_id"/>
+
+        <!-- 嵌套查询本阶段下的所有任务明细 -->
+        <collection property="tasks"
+                    ofType="com.ruoyi.oa.domain.vo.OaProgressDetailVo"
+                    javaType="list"
+                    select="queryDetailsByProgressId"
+                    column="progress_id"/>
     </resultMap>
 
+    <!-- 2. 定义 OaProgressDetailVo 的映射 -->
+    <resultMap id="OaProgressDetailResult" type="com.ruoyi.oa.domain.vo.OaProgressDetailVo">
+        <id     property="detailId"       column="detail_id"/>
+        <result property="progressId"     column="progress_id"/>
+        <result property="detailName"     column="detail_name"/>
+        <result property="planStartDate"  column="plan_start_date"/>
+        <result property="planEndDate"    column="plan_end_date"/>
+        <result property="actualStartDate" column="actual_start_date"/>
+        <result property="actualEndDate"  column="actual_end_date"/>
+        <result property="completePercent" column="complete_percent"/>
+        <result property="planPayDate"    column="plan_pay_date"/>
+        <result property="payAmount"      column="pay_amount"/>
+        <result property="paidAmount"     column="paid_amount"/>
+        <result property="remark"         column="remark"/>
+        <result property="detailStatus"   column="detail_status"/>
+    </resultMap>
+
+    <!-- 3. 查询所有父进度（parent_id = 0）-->
+    <select id="queryByProjectId"
+            parameterType="java.lang.Long"
+            resultMap="OaProgressResult">
+        SELECT
+            progress_id,
+            project_id,
+            type,
+            progress_name,
+            parent_id,
+            sort,
+            remark,
+            status,
+            time_remark,
+            contact_phone
+        FROM oa_progress
+        WHERE project_id = #{projectId}
+          AND parent_id = 0
+          AND del_flag = 0
+        ORDER BY sort
+    </select>
+
+    <!-- 4. 根据 parentId 查询子进度 -->
+    <select id="queryByParentId"
+            parameterType="java.lang.Long"
+            resultMap="OaProgressResult">
+        SELECT
+            progress_id,
+            project_id,
+            type,
+            progress_name,
+            parent_id,
+            sort,
+            remark,
+            status,
+            time_remark,
+            contact_phone
+        FROM oa_progress
+        WHERE parent_id = #{parentId}
+          AND del_flag = 0
+        ORDER BY sort
+    </select>
+
+    <!-- 5. 根据 progressId 查询对应的所有任务明细 -->
+    <select id="queryDetailsByProgressId"
+            parameterType="java.lang.Long"
+            resultMap="OaProgressDetailResult">
+        SELECT
+            detail_id,
+            progress_id,
+            detail_name,
+            plan_start_date,
+            plan_end_date,
+            actual_start_date,
+            actual_end_date,
+            complete_percent,
+            plan_pay_date,
+            pay_amount,
+            paid_amount,
+            remark,
+            detail_status
+        FROM oa_progress_detail
+        WHERE progress_id = #{progressId}
+          AND del_flag = 0
+        ORDER BY plan_start_date
+    </select>
+
 
     <select id="getKeyList" resultType="com.ruoyi.oa.domain.OaProgressDetail">
         select distinct detail_name, department
@@ -101,4 +195,6 @@
     </select>
 
 
+
+
 </mapper>