fix:完成任务状态，任务同步，高度同步等工作

wlzboy

2025-10-25 a5b842f1f6ab32f1af39f4bcb7e45217e94db761

 ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -16,6 +16,9 @@
      <result property="status"     column="status"      />
      <result property="delFlag"    column="del_flag"    />
      <result property="parentName" column="parent_name" />
      <result property="departmentId" column="department_id" />
      <result property="serviceOrderClass" column="service_order_class" />
      <result property="dispatchOrderClass" column="dispatch_order_class" />
      <result property="createBy"   column="create_by"   />
      <result property="createTime" column="create_time" />
      <result property="updateBy"   column="update_by"   />
@@ -23,7 +26,7 @@
   </resultMap>
   
   <sql id="selectDeptVo">
        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.department_id, d.service_order_class, d.dispatch_order_class, d.create_by, d.create_time 
        from sys_dept d
    </sql>
    
@@ -59,7 +62,7 @@
   </select>
    
    <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
      select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
      select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.department_id, d.service_order_class, d.dispatch_order_class,
         (select dept_name from sys_dept where dept_id = d.parent_id) parent_name
      from sys_dept d
      where d.dept_id = #{deptId}
@@ -98,6 +101,9 @@
          <if test="phone != null and phone != ''">phone,</if>
          <if test="email != null and email != ''">email,</if>
          <if test="status != null">status,</if>
          <if test="departmentId != null">department_id,</if>
          <if test="serviceOrderClass != null and serviceOrderClass != ''">service_order_class,</if>
          <if test="dispatchOrderClass != null and dispatchOrderClass != ''">dispatch_order_class,</if>
          <if test="createBy != null and createBy != ''">create_by,</if>
          create_time
       )values(
@@ -110,6 +116,9 @@
          <if test="phone != null and phone != ''">#{phone},</if>
          <if test="email != null and email != ''">#{email},</if>
          <if test="status != null">#{status},</if>
          <if test="departmentId != null">#{departmentId},</if>
          <if test="serviceOrderClass != null and serviceOrderClass != ''">#{serviceOrderClass},</if>
          <if test="dispatchOrderClass != null and dispatchOrderClass != ''">#{dispatchOrderClass},</if>
          <if test="createBy != null and createBy != ''">#{createBy},</if>
          sysdate()
       )
@@ -126,6 +135,9 @@
          <if test="phone != null">phone = #{phone},</if>
          <if test="email != null">email = #{email},</if>
          <if test="status != null and status != ''">status = #{status},</if>
          <if test="departmentId != null">department_id = #{departmentId},</if>
          <if test="serviceOrderClass != null">service_order_class = #{serviceOrderClass},</if>
          <if test="dispatchOrderClass != null">dispatch_order_class = #{dispatchOrderClass},</if>
          <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
          update_time = sysdate()
       </set>
@@ -156,4 +168,20 @@
      update sys_dept set del_flag = '2' where dept_id = #{deptId}
   </delete>

   <!-- 根据departmentId查询部门 -->
   <select id="selectDeptByDepartmentId" parameterType="Integer" resultMap="SysDeptResult">
      <include refid="selectDeptVo"/>
      where d.department_id = #{departmentId} and d.del_flag = '0'
      limit 1
   </select>

   <!-- 根据departmentId和父部门ID查询部门 -->
   <select id="selectDeptByDepartmentIdAndParentId" resultMap="SysDeptResult">
      <include refid="selectDeptVo"/>
      where d.department_id = #{departmentId} 
        and d.parent_id = #{parentId} 
        and d.del_flag = '0'
      limit 1
   </select>

</mapper>