进度+文件上传重构+文件权限控制
This commit is contained in:
@@ -20,17 +20,29 @@
|
||||
<result property="actualEnd" column="actual_end"/>
|
||||
<result property="status" column="status"/>
|
||||
<result property="expectedDays" column="expected_days"/>
|
||||
<result property="useFlag" column="use_flag"/>
|
||||
|
||||
<!-- ========== 附件列表：多对一 折叠 ========= -->
|
||||
<collection property="fileList"
|
||||
ofType="com.ruoyi.system.domain.SysOss"
|
||||
javaType="java.util.ArrayList">
|
||||
<result property="ossId" column="attach_oss_id"/>
|
||||
<result property="ossId" column="oss_id"/>
|
||||
<result property="url" column="attach_url"/>
|
||||
<result property="fileName" column="attach_file_name"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="isPublic" column="is_public"/>
|
||||
<result property="ownerId" column="owner_id"/>
|
||||
</collection>
|
||||
</resultMap>
|
||||
|
||||
<sql id="OssVisibleCondition">
|
||||
( so.is_public = 1
|
||||
OR so.owner_id = #{userId}
|
||||
OR EXISTS (SELECT 1 FROM sys_oss_acl a
|
||||
WHERE a.oss_id = so.oss_id
|
||||
AND a.user_id = #{userId}) )
|
||||
</sql>
|
||||
|
||||
<update id="updateByStepAndScheduleId">
|
||||
UPDATE oa_project_schedule_step
|
||||
SET
|
||||
@@ -40,6 +52,7 @@
|
||||
schedule_id = #{scheduleId}
|
||||
AND step_order = #{currentStep}
|
||||
AND del_flag = '0'
|
||||
and use_flag = '1'
|
||||
</update>
|
||||
<select id="maxStepByScheduleId" resultMap="OaProjectScheduleStepResult">
|
||||
SELECT opss.track_id,
|
||||
@@ -54,6 +67,7 @@
|
||||
opss.status,
|
||||
opss.del_flag,
|
||||
opss.header,
|
||||
opss.use_flag,
|
||||
osts.expected_days,
|
||||
osts.description
|
||||
FROM oa_project_schedule_step opss
|
||||
@@ -61,12 +75,15 @@
|
||||
LEFT JOIN fad_oa.oa_schedule_template_step osts ON osts.template_id = ops.template_id AND osts.step_order = opss.step_order
|
||||
WHERE opss.schedule_id = #{scheduleId}
|
||||
AND opss.del_flag = '0'
|
||||
and opss.use_flag = '1'
|
||||
AND opss.step_order = (
|
||||
SELECT MAX(step_order)
|
||||
FROM oa_project_schedule_step
|
||||
WHERE schedule_id = #{scheduleId}
|
||||
AND del_flag = '0'
|
||||
and use_flag = '1'
|
||||
)
|
||||
|
||||
</select>
|
||||
<select id="selectVoPagePlus" resultMap="OaProjectScheduleStepResult">
|
||||
select opss.track_id,
|
||||
@@ -81,42 +98,53 @@
|
||||
opss.status,
|
||||
opss.del_flag,
|
||||
opss.header,
|
||||
opss.use_flag,
|
||||
osts.expected_days,
|
||||
osts.description,
|
||||
so.oss_id AS oss_id,
|
||||
so.url AS attach_url,
|
||||
so.original_name AS attach_file_name, -- 如有需要
|
||||
so.create_by
|
||||
so.create_by,
|
||||
so.is_public,
|
||||
so.owner_id,
|
||||
batch_id
|
||||
from oa_project_schedule_step opss
|
||||
left join fad_oa.oa_project_schedule ops on ops.schedule_id = opss.schedule_id
|
||||
left join fad_oa.oa_schedule_template_step osts on osts.template_id = ops.template_id and osts.step_order = opss.step_order
|
||||
LEFT JOIN sys_oss so ON FIND_IN_SET(so.oss_id, opss.accessory)
|
||||
LEFT JOIN sys_oss so ON FIND_IN_SET(so.oss_id, opss.accessory)
|
||||
AND <include refid="OssVisibleCondition"/>
|
||||
${ew.getCustomSqlSegment}
|
||||
</select>
|
||||
<select id="selectVoPlusById" resultMap="OaProjectScheduleStepResult">
|
||||
select opss.track_id,
|
||||
opss.accessory,
|
||||
opss.schedule_id,
|
||||
opss.step_order,
|
||||
opss.step_name,
|
||||
opss.plan_start,
|
||||
opss.plan_end,
|
||||
opss.actual_start,
|
||||
opss.actual_end,
|
||||
opss.status,
|
||||
opss.del_flag,
|
||||
opss.header,
|
||||
osts.expected_days,
|
||||
osts.description,
|
||||
so.oss_id AS oss_id,
|
||||
so.url AS attach_url,
|
||||
so.original_name AS attach_file_name, -- 如有需要
|
||||
so.create_by
|
||||
opss.accessory,
|
||||
opss.schedule_id,
|
||||
opss.step_order,
|
||||
opss.step_name,
|
||||
opss.plan_start,
|
||||
opss.plan_end,
|
||||
opss.actual_start,
|
||||
opss.actual_end,
|
||||
opss.status,
|
||||
opss.use_flag,
|
||||
opss.del_flag,
|
||||
opss.header,
|
||||
osts.expected_days,
|
||||
osts.description,
|
||||
so.oss_id AS oss_id,
|
||||
so.url AS attach_url,
|
||||
so.original_name AS attach_file_name, -- 如有需要
|
||||
so.create_by,
|
||||
so.owner_id,
|
||||
so.is_public
|
||||
from oa_project_schedule_step opss
|
||||
left join fad_oa.oa_project_schedule ops on ops.schedule_id = opss.schedule_id
|
||||
left join fad_oa.oa_schedule_template_step osts on osts.template_id = ops.template_id and osts.step_order = opss.step_order
|
||||
LEFT JOIN sys_oss so ON FIND_IN_SET(so.oss_id, opss.accessory)
|
||||
where opss.track_id = #{trackId} and opss.del_flag='0'
|
||||
left join fad_oa.oa_project_schedule ops on ops.schedule_id = opss.schedule_id
|
||||
left join fad_oa.oa_schedule_template_step osts on osts.template_id = ops.template_id and osts.step_order =
|
||||
opss.step_order
|
||||
LEFT JOIN sys_oss so ON FIND_IN_SET(so.oss_id, opss.accessory)
|
||||
AND
|
||||
<include refid="OssVisibleCondition"/>
|
||||
where opss.track_id = #{trackId} and opss.del_flag='0' and opss.use_flag = '1'
|
||||
</select>
|
||||
|
||||
|
||||
@@ -130,11 +158,13 @@
|
||||
plan_end,
|
||||
actual_start,
|
||||
actual_end,
|
||||
opss.use_flag,
|
||||
status,
|
||||
header
|
||||
from oa_project_schedule_step opss
|
||||
WHERE schedule_id = #{scheduleId}
|
||||
AND step_order = #{currentStep}
|
||||
and use_flag = '1'
|
||||
AND del_flag = '0'
|
||||
</select>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user