feat: 企标稽查列表的计划稽查对象

This commit is contained in:
2023-09-13 11:52:38 +08:00
parent 59d1056fdd
commit 1e95cbbbb7
2 changed files with 19 additions and 6 deletions
@@ -22,6 +22,10 @@ public class EnterpriseStandardInspectVo {
@ApiModelProperty(value = "稽查依据标准号")
private String inspectNo;
/** 计划稽查对象 */
@ApiModelProperty(value = "计划稽查对象")
private String planInspectObject;
/** 稽查依据标准名称 */
@ApiModelProperty(value = "稽查依据标准名称")
private String inspectName;
@@ -28,7 +28,8 @@
i.id,
s.standard_no AS inspectNo,
s.standard_name AS inspectName,
i.standardization_work_group AS standardizationWorkGroup,
io.planInspectObject AS planInspectObject,
w.`name` AS standardizationWorkGroup,
d.depart_name AS belongDept,
i.plan_inspect_date AS planInspectDate,
u1.username AS inspectUser,
@@ -39,11 +40,19 @@
i.create_time AS createTime
FROM
`laws_enterprise_standard_inspect` AS i
LEFT JOIN laws_enterprise_standard AS s ON s.standard_no = i.inspect_no
LEFT JOIN sys_depart AS d on d.id = i.belong_dept
LEFT JOIN sys_user AS u1 ON u1.id = i.inspect_user
LEFT JOIN sys_user AS u2 ON u2.id = i.standardization_docking_user
LEFT JOIN sys_user AS u3 ON u3.id = i.actual_inspect_user
LEFT JOIN laws_working_group AS w ON w.id = i.standardization_work_group
LEFT JOIN laws_enterprise_standard AS s ON s.standard_no = i.inspect_no
LEFT JOIN sys_depart AS d ON d.id = i.belong_dept
LEFT JOIN sys_user AS u1 ON u1.id = i.inspect_user
LEFT JOIN sys_user AS u2 ON u2.id = i.standardization_docking_user
LEFT JOIN sys_user AS u3 ON u3.id = i.actual_inspect_user
LEFT JOIN
(SELECT
io.inspect_id as id,
GROUP_CONCAT((d.depart_name) SEPARATOR '') AS planInspectObject
FROM
laws_enterprise_standard_inspect_object AS io
LEFT JOIN sys_depart AS d ON d.id = io.plan_inspect_object) AS io ON io.id = i.id
WHERE 1 = 1
<!--企标编号判断-->
<if test="param.standardNo != null and param.standardNo != ''">