|
@@ -50,6 +50,9 @@
|
|
|
<result column="evaluate" property="evaluate"/>
|
|
|
<result column="queryType" property="queryType"/>
|
|
|
<result column="isExperiment" property="isExperiment"/>
|
|
|
+ <result column="dateIsComplete" property="dateIsComplete"/>
|
|
|
+ <result column="infoQueryName" property="infoQueryName"/>
|
|
|
+ <result column="pdfUrl" property="pdfUrl"/>
|
|
|
</resultMap>
|
|
|
|
|
|
<resultMap id="queryContractTreeMap" type="org.springblade.manager.vo.WbsTreeContractTreeVOS">
|
|
@@ -428,9 +431,12 @@
|
|
|
wtc.p_key_id,
|
|
|
wtc.ancestors,
|
|
|
wtc.major_data_type,
|
|
|
+ wtc.date_is_complete AS dateIsComplete,
|
|
|
IFNULL(if(length(trim(wtc.full_name)) > 0, wtc.full_name, wtc.node_name), wtc.node_name) AS title,
|
|
|
wtc.parent_id AS parentId,
|
|
|
uiq.id AS informationQueryId,
|
|
|
+ uiq.name AS infoQueryName,
|
|
|
+ uiq.pdf_url AS pdfUrl,
|
|
|
uiq.status,
|
|
|
(
|
|
|
select case iq.status
|
|
@@ -450,26 +456,10 @@
|
|
|
AS isExperiment
|
|
|
FROM
|
|
|
m_wbs_tree_contract AS wtc
|
|
|
- LEFT JOIN u_information_query AS uiq ON wtc.p_key_id = uiq.wbs_id AND uiq.classify =
|
|
|
- #{classify}
|
|
|
- and
|
|
|
- uiq
|
|
|
- .
|
|
|
- is_deleted
|
|
|
- =
|
|
|
- 0
|
|
|
+ LEFT JOIN u_information_query AS uiq ON wtc.p_key_id = uiq.wbs_id AND uiq.classify = #{classify} and uiq.is_deleted = 0 and uiq.status != 3
|
|
|
WHERE
|
|
|
- wtc
|
|
|
- .
|
|
|
- p_key_id
|
|
|
- =
|
|
|
- #{primaryKeyId}
|
|
|
- AND
|
|
|
- wtc
|
|
|
- .
|
|
|
- is_deleted
|
|
|
- =
|
|
|
- 0
|
|
|
+ wtc.p_key_id = #{primaryKeyId}
|
|
|
+ AND wtc.is_deleted = 0
|
|
|
</select>
|
|
|
|
|
|
<select id="queryProcessDataByParentIdAndContractId" resultMap="queryProcessDataMap">
|
|
@@ -822,6 +812,7 @@
|
|
|
</select>
|
|
|
<select id="queryProcessDataByParentIdAndContractIdTwo" resultMap="queryProcessDataMap">
|
|
|
SELECT wtc.id AS treeId,
|
|
|
+ wtc.date_is_complete AS dateIsComplete,
|
|
|
wtc.p_key_id,
|
|
|
wtc.ancestors,
|
|
|
wtc.major_data_type,
|
|
@@ -831,14 +822,15 @@
|
|
|
uiq.id AS informationQueryId,
|
|
|
IFNULL(uiq.status, 0) AS status,
|
|
|
uiq.type AS queryType,
|
|
|
+ uiq.name AS infoQueryName,
|
|
|
+ uiq.pdf_url AS pdfUrl,
|
|
|
case
|
|
|
WHEN uiq.pdf_trial_url is null then 'false'
|
|
|
ELSE 'true' end AS isExperiment
|
|
|
FROM m_wbs_tree_contract AS wtc
|
|
|
LEFT JOIN u_information_query AS uiq
|
|
|
ON wtc.p_key_id = uiq.wbs_id AND uiq.classify = #{classify} and uiq.is_deleted = 0 and
|
|
|
- wtc.is_deleted = 0 and
|
|
|
- wtc.status = 1
|
|
|
+ uiq.status != 3
|
|
|
WHERE wtc.type = 1
|
|
|
AND wtc.major_data_type in (0, 1, 2, 3, 4)
|
|
|
AND wtc.ancestors like concat('%', #{parentId}, '%')
|