diff --git a/src/main/java/com/spring/modules/lab/entity/LabEntity.java b/src/main/java/com/spring/modules/lab/entity/LabEntity.java index 497ebe33..b207e66f 100644 --- a/src/main/java/com/spring/modules/lab/entity/LabEntity.java +++ b/src/main/java/com/spring/modules/lab/entity/LabEntity.java @@ -161,6 +161,11 @@ public class LabEntity implements Serializable { */ private String tester; + /** + * 实验室审批人(;分隔) + */ + private String labApprover; + /** * 单据状态(草稿/审批中/已完成) */ @@ -247,6 +252,12 @@ public class LabEntity implements Serializable { @TableField(exist = false) private String testerName; + /** + * 实验室审批人名称 + */ + @TableField(exist = false) + private String labApproverName; + /** * 属性信息 */ diff --git a/src/main/resources/mapper/lab/LabMapper.xml b/src/main/resources/mapper/lab/LabMapper.xml index 2ac1b560..bc404aab 100644 --- a/src/main/resources/mapper/lab/LabMapper.xml +++ b/src/main/resources/mapper/lab/LabMapper.xml @@ -30,6 +30,7 @@ + @@ -45,6 +46,7 @@ + @@ -52,7 +54,7 @@ a.project_id, a.customer_id, a.sample_name, a.sample_model, a.sample_qty, a.test_purpose, a.product_stage, a.test_type, a.report_document, a.return_sample, a.application_surface, a.test_lab, a.attention, a.test_start_date, a.completed_date, a.unnormal_symptom_and_description, a.test_number, - a.tester_comments, a.department_manager_comments, a.lab_comments, a.tester, a.status, a.create_date, + a.tester_comments, a.department_manager_comments, a.lab_comments, a.tester, a.lab_approver, a.status, a.create_date, a.create_by, a.update_date, a.update_by, a.step_id, a.reject_flag, a.reject_step_id @@ -69,7 +71,8 @@ dbo.get_userDisPlay(a.applicant) as applicantName, dbo.plm_get_customer_desc(a.site, a.customer_id) as customerName, dbo.plm_get_project_name(a.site, a.project_id) as projectName, - dbo.get_userDisPlay(a.tester) as testerName + dbo.get_userDisPlay(a.tester) as testerName, + dbo.get_userDisPlay(a.lab_approver) as labApproverName from plm_lab a left join plm_request_header prh on a.site = prh.site and prh.menu_id = #{params.menuId} and prh.status = 'Y' left join plm_request_node d on a.site = d.site and prh.classification_no = d.classification_no and prh.workflow_id = d.workflow_id and a.step_id = d.step_id @@ -101,7 +104,8 @@ dbo.get_userDisPlay(a.applicant) as applicantName, dbo.plm_get_customer_desc(a.site, a.customer_id) as customerName, dbo.plm_get_project_name(a.site, a.project_id) as projectName, - dbo.get_userDisPlay(a.tester) as testerName + dbo.get_userDisPlay(a.tester) as testerName, + dbo.get_userDisPlay(a.lab_approver) as labApproverName from plm_lab a where a.site = #{site} and a.reference_no = #{referenceNo}