付款进度代码同步

This commit is contained in:
2025-05-25 18:15:07 +08:00
parent af5ae35562
commit d5660ee8aa
17 changed files with 690 additions and 60 deletions

View File

@@ -22,6 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createUserNickName" column="createUserNickName"/>
<result property="workerNickName" column="workerNickName"/>
<result property="postponements" column="postponements"/>
<result property="accessory" column="accessory"/>
<collection property="taskItemVoList" ofType="com.ruoyi.oa.domain.vo.SysOaTaskItemVo" javaType="list">
<result property="itemId" column="item_id"/>
<result property="content" column="itemContent"/>
@@ -31,6 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="endTime" column="itemEndTime"/>
<result property="remark" column="itemRemark"/>
<result property="completedTime" column="itemCompletedTime"/>
<result property="files" column="files"/>
</collection>
</resultMap>
@@ -112,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sot.task_title,
sot.task_type,
sot.task_grade,
sot.accessory,
COALESCE(
sot.finish_time,
(SELECT a.end_time
@@ -138,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
su1.nick_name AS createUserNickName,
su2.nick_name AS workerNickName,
sot.accessory,
sot.rank_number,
sot.remark,
sot.task_rank,