新增文件预览列表修复了任务显示ossId但是无法现在的情况
新增项目编号索引
This commit is contained in:
@@ -60,7 +60,15 @@
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="count" column="count"/>
|
||||
<result property="laborCost" column="labor_cost"/>
|
||||
|
||||
<result property="projectCode" column="project_code"/>
|
||||
<collection property="fileList" ofType="com.ruoyi.system.domain.SysOss" javaType="list">
|
||||
<result property="ossId" column="oss_id"/>
|
||||
<result property="fileName" column="file_name"/>
|
||||
<result property="fileSuffix" column="file_suffix"/>
|
||||
<result property="originalName" column="original_name"/>
|
||||
<result property="url" column="url"/>
|
||||
<result property="service" column="service"/>
|
||||
</collection>
|
||||
</resultMap>
|
||||
|
||||
|
||||
@@ -84,6 +92,7 @@
|
||||
<select id="selectPageOutList" resultMap="SysOaOutWarehouseListVoResult">
|
||||
select sop.project_id,
|
||||
project_name,
|
||||
sop.project_code,
|
||||
soow.warehouse_id,
|
||||
soow.id as soow_id,
|
||||
soow.amount,
|
||||
@@ -99,6 +108,7 @@
|
||||
SELECT
|
||||
p.project_id,
|
||||
p.project_name,
|
||||
p.project_code,
|
||||
p.color,
|
||||
-- 子查询里已经聚合完 labor_cost
|
||||
a.labor_cost,
|
||||
@@ -136,6 +146,7 @@
|
||||
<select id="getProjectDataByMonthAndDate" resultType="com.ruoyi.oa.domain.vo.SysOaProjectVo">
|
||||
select sum(soa.day_length + soa.hour / 8) as labor_cost,
|
||||
color,
|
||||
sop.project_code,
|
||||
sop.project_name,
|
||||
date_format(soa.create_time, '%Y-%m-%d') as create_time
|
||||
from sys_oa_project sop
|
||||
@@ -147,6 +158,7 @@
|
||||
<select id="selectListToCost" resultType="com.ruoyi.oa.domain.vo.SysOaCostAllVo">
|
||||
SELECT
|
||||
sop.project_name,sop.project_num,sop.project_id,sop.funds,
|
||||
sop.project_code,
|
||||
|
||||
(
|
||||
SELECT COALESCE(SUM(soc.cost),0)
|
||||
@@ -264,6 +276,7 @@
|
||||
p.trade_type,
|
||||
p.project_id,
|
||||
p.project_name,
|
||||
p.project_code,
|
||||
p.project_num,
|
||||
p.project_type,
|
||||
p.address,
|
||||
@@ -339,6 +352,7 @@
|
||||
sop.project_id AS p_id,
|
||||
sop.project_name AS project_name,
|
||||
sop.update_time,
|
||||
sop.project_code,
|
||||
t.task_id AS task_id,
|
||||
t.task_type AS task_type,
|
||||
t.status AS task_status,
|
||||
@@ -389,6 +403,7 @@
|
||||
<result property="projectName" column="project_name"/>
|
||||
<result property="projectNum" column="project_num"/>
|
||||
<result property="projectType" column="project_type"/>
|
||||
<result property="projectCode" column="project_code,"/>
|
||||
<result property="remainTime" column="remainTime"/>
|
||||
<!-- 根据项目 ID 查询顶级进度（parent_id 为 0 或 NULL） -->
|
||||
<collection property="progressList"
|
||||
@@ -428,6 +443,7 @@
|
||||
p.progress_name,
|
||||
p.parent_id,
|
||||
p.sort,
|
||||
|
||||
p.remark,
|
||||
p.status,
|
||||
-- 孩子节点总数：如果没有匹配则返回 0
|
||||
@@ -474,6 +490,7 @@
|
||||
p.project_name,
|
||||
p.project_num,
|
||||
p.project_type,
|
||||
p.project_code,
|
||||
p.funds,
|
||||
TIMESTAMPDIFF(DAY, NOW(), p.postpone_time) AS remainTime
|
||||
FROM sys_oa_project p
|
||||
@@ -488,6 +505,7 @@
|
||||
sop.project_num,
|
||||
sop.begin_time,
|
||||
sop.finish_time,
|
||||
sop.project_code,
|
||||
sop.functionary,
|
||||
IFNULL(
|
||||
SUM(CASE WHEN d.detail_status = 1 THEN 1 ELSE 0 END) * 100
|
||||
@@ -502,6 +520,86 @@
|
||||
AND d.del_flag = 0
|
||||
${ ew.getCustomSqlSegment}
|
||||
</select>
|
||||
<select id="listWareProject" resultType="com.ruoyi.oa.domain.vo.SysOaProjectVo">
|
||||
SELECT distinct sop.project_id,
|
||||
project_name,
|
||||
project_num,
|
||||
project_type,
|
||||
address,
|
||||
funds,
|
||||
functionary,
|
||||
begin_time,
|
||||
finish_time,
|
||||
delivery,
|
||||
guarantee,
|
||||
introduction,
|
||||
project_grade,
|
||||
project_status,
|
||||
contract_id,
|
||||
invoice_name,
|
||||
invoice_number,
|
||||
invoice_address,
|
||||
invoice_bank,
|
||||
accessory,
|
||||
bail,
|
||||
is_postpone,
|
||||
postpone_reason,
|
||||
postpone_time,
|
||||
color,
|
||||
trade_type,
|
||||
sop.project_code,
|
||||
pre_pay
|
||||
FROM sys_oa_project sop
|
||||
INNER JOIN sys_oa_warehouse_master sown
|
||||
ON sown.project_id = sop.project_id
|
||||
${ ew.getCustomSqlSegment}
|
||||
</select>
|
||||
<select id="selectVoByIdPlus" resultMap="SysOaProjectVoResult">
|
||||
select sop.project_id,
|
||||
project_name,
|
||||
project_num,
|
||||
project_type,
|
||||
address,
|
||||
funds,
|
||||
functionary,
|
||||
begin_time,
|
||||
finish_time,
|
||||
delivery,
|
||||
guarantee,
|
||||
introduction,
|
||||
project_grade,
|
||||
project_status,
|
||||
contract_id,
|
||||
invoice_name,
|
||||
invoice_number,
|
||||
invoice_address,
|
||||
invoice_bank,
|
||||
bail,
|
||||
remark,
|
||||
accessory,
|
||||
sop.create_by,
|
||||
sop.create_time,
|
||||
sop.update_by,
|
||||
sop.update_time,
|
||||
sop.project_code,
|
||||
is_postpone,
|
||||
postpone_reason,
|
||||
postpone_time,
|
||||
color,
|
||||
trade_type,
|
||||
pre_pay,
|
||||
so.oss_id,
|
||||
file_name,
|
||||
original_name,
|
||||
file_suffix,
|
||||
url,
|
||||
service,
|
||||
is_public,
|
||||
owner_id
|
||||
from sys_oa_project sop
|
||||
left join sys_oss so on FIND_IN_SET(so.oss_id, sop.accessory)
|
||||
where sop.project_id = #{projectId}
|
||||
</select>
|
||||
|
||||
|
||||
</mapper>
|
||||
|
||||
Reference in New Issue
Block a user