diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml index 1e173ea..11e653e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -103,14 +103,15 @@ csi.manufacturing_no AS manufacturingNo, bor.measure_category AS measureCategory, bo.order_code AS orderCode, - su.name AS measurePersonName + bo.customer_name as customerName, + ms.name AS measurePersonName FROM business_certificate_report bcr LEFT JOIN business_order bo ON bcr.order_id=bo.id LEFT JOIN customer_sample_info csi ON bcr.sample_id=csi.id - LEFT JOIN sys_user su - ON bcr.measure_person_id=su.id + LEFT JOIN meter_staff ms + ON bcr.measure_person_id=ms.id LEFT JOIN business_original_record bor ON bcr.original_record_id=bor.id WHERE bcr.is_del = 0 and bor.is_del = 0 @@ -152,15 +153,16 @@ csi.sample_model AS sampleModel, csi.manufacturing_no AS manufacturingNo, bo.order_code AS orderCode, - su.name AS measurePersonName, + bo.customer_name as customerName, + ms.name AS measurePersonName, bor.measure_category AS measureCategory FROM business_certificate_report bcr LEFT JOIN business_order bo ON bcr.order_id=bo.id LEFT JOIN customer_sample_info csi ON bcr.sample_id=csi.id - LEFT JOIN sys_user su - ON bcr.measure_person_id=su.id + LEFT JOIN meter_staff ms + ON bcr.measure_person_id=ms.id LEFT JOIN business_original_record bor ON bcr.original_record_id=bor.id WHERE bcr.is_del = 0 and bor.is_del = 0 @@ -213,10 +215,10 @@ bcr.submit_date AS submitTime, bcr.update_time AS finishedTime, bcr.approval_status AS certificateStatus, - su.NAME AS createUser + ms.NAME AS createUser FROM business_certificate_report bcr - LEFT JOIN sys_user su ON bcr.create_user = su.id + LEFT JOIN meter_staff ms ON bcr.create_user = ms.id WHERE bcr.is_del =0 diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml index 1e173ea..11e653e 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -103,14 +103,15 @@ csi.manufacturing_no AS manufacturingNo, bor.measure_category AS measureCategory, bo.order_code AS orderCode, - su.name AS measurePersonName + bo.customer_name as customerName, + ms.name AS measurePersonName FROM business_certificate_report bcr LEFT JOIN business_order bo ON bcr.order_id=bo.id LEFT JOIN customer_sample_info csi ON bcr.sample_id=csi.id - LEFT JOIN sys_user su - ON bcr.measure_person_id=su.id + LEFT JOIN meter_staff ms + ON bcr.measure_person_id=ms.id LEFT JOIN business_original_record bor ON bcr.original_record_id=bor.id WHERE bcr.is_del = 0 and bor.is_del = 0 @@ -152,15 +153,16 @@ csi.sample_model AS sampleModel, csi.manufacturing_no AS manufacturingNo, bo.order_code AS orderCode, - su.name AS measurePersonName, + bo.customer_name as customerName, + ms.name AS measurePersonName, bor.measure_category AS measureCategory FROM business_certificate_report bcr LEFT JOIN business_order bo ON bcr.order_id=bo.id LEFT JOIN customer_sample_info csi ON bcr.sample_id=csi.id - LEFT JOIN sys_user su - ON bcr.measure_person_id=su.id + LEFT JOIN meter_staff ms + ON bcr.measure_person_id=ms.id LEFT JOIN business_original_record bor ON bcr.original_record_id=bor.id WHERE bcr.is_del = 0 and bor.is_del = 0 @@ -213,10 +215,10 @@ bcr.submit_date AS submitTime, bcr.update_time AS finishedTime, bcr.approval_status AS certificateStatus, - su.NAME AS createUser + ms.NAME AS createUser FROM business_certificate_report bcr - LEFT JOIN sys_user su ON bcr.create_user = su.id + LEFT JOIN meter_staff ms ON bcr.create_user = ms.id WHERE bcr.is_del =0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java index 4581acf..2368b43 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportResponse.java @@ -57,6 +57,9 @@ @ExcelProperty(value = "委托书编号", order = 6) private String orderCode; + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + @ApiModelProperty(value = "检校专业", dataType = "String") @DictCodeField(message = "检校专业不合法", cacheName = MeterDictCode.CALIBRATION_MAJOR) private String calibrationMajor;