|
|
@@ -217,7 +217,8 @@
|
|
|
t.plan_end_time,
|
|
|
t.grant_user_id,
|
|
|
t.source_type,
|
|
|
- t.role_id
|
|
|
+ t.role_id,
|
|
|
+ t.pdf_url
|
|
|
FROM core_safety_task t
|
|
|
LEFT JOIN sys_org o1 ON o1.id = t.org_id
|
|
|
LEFT JOIN sys_org o2 ON o2.id = t.check_org_id
|
|
|
@@ -695,26 +696,26 @@
|
|
|
and a.deleted = 0)
|
|
|
</select>
|
|
|
<select id="selectPointByTask" resultType="com.xunmei.core.safetyCheck.vo.regsiter.AppTaskRegisterPointVo">
|
|
|
- SELECT f.id as areaId,
|
|
|
- f.name as areaName,
|
|
|
- e.id as itemId,
|
|
|
- e.name as itemName,
|
|
|
- rd.id as pointDataId,
|
|
|
- a.id as pointId,
|
|
|
- a.name as pointName,
|
|
|
- 1 as mustCheck,
|
|
|
- rd.is_add as isAdd,
|
|
|
- rd.value as status,
|
|
|
- rd.remark as remark,
|
|
|
- rd.rectification_deadline as rectificationDeadline,
|
|
|
- rd.submit_by,
|
|
|
- rd.submit_time
|
|
|
+ SELECT f.id as areaId,
|
|
|
+ f.name as areaName,
|
|
|
+ e.id as itemId,
|
|
|
+ e.name as itemName,
|
|
|
+ rd.id as pointDataId,
|
|
|
+ a.id as pointId,
|
|
|
+ a.name as pointName,
|
|
|
+ 1 as mustCheck,
|
|
|
+ rd.is_add as isAdd,
|
|
|
+ rd.value as status,
|
|
|
+ rd.remark as remark,
|
|
|
+ rd.rectification_deadline as rectificationDeadline,
|
|
|
+ rd.submit_by,
|
|
|
+ rd.submit_time
|
|
|
FROM core_safety_task_data rd
|
|
|
- LEFT JOIN core_safetycheck_rule_point a ON a.id = rd.point_id
|
|
|
- LEFT JOIN core_safetycheck_rule_item e ON a.item_id = e.id
|
|
|
- LEFT JOIN sys_area f ON a.area_id = f.id
|
|
|
+ LEFT JOIN core_safetycheck_rule_point a ON a.id = rd.point_id
|
|
|
+ LEFT JOIN core_safetycheck_rule_item e ON a.item_id = e.id
|
|
|
+ LEFT JOIN sys_area f ON a.area_id = f.id
|
|
|
WHERE rd.task_id = #{taskId}
|
|
|
- and a.deleted = 0
|
|
|
+ and a.deleted = 0
|
|
|
</select>
|
|
|
|
|
|
<select id="selectNfc" resultType="com.xunmei.core.safetyCheck.vo.regsiter.TaskRegisterNfcVo">
|
luojun