diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml index 46508b3..767695d 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml @@ -46,6 +46,7 @@ SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name FROM biz_business_certificate_report bcr LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id) + LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id WHERE 1=1 @@ -54,6 +55,9 @@ and bcr.create_user_id = #{request.createUserId} + + and boi.customer_id = #{request.customerId} + and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml index 46508b3..767695d 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml @@ -46,6 +46,7 @@ SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name FROM biz_business_certificate_report bcr LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id) + LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id WHERE 1=1 @@ -54,6 +55,9 @@ and bcr.create_user_id = #{request.createUserId} + + and boi.customer_id = #{request.customerId} + and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml index c9db367..3049b54 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml @@ -7,6 +7,8 @@ + + @@ -55,7 +57,7 @@ - id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time + id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml index 46508b3..767695d 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml @@ -46,6 +46,7 @@ SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name FROM biz_business_certificate_report bcr LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id) + LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id WHERE 1=1 @@ -54,6 +55,9 @@ and bcr.create_user_id = #{request.createUserId} + + and boi.customer_id = #{request.customerId} + and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml index c9db367..3049b54 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml @@ -7,6 +7,8 @@ + + @@ -55,7 +57,7 @@ - id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time + id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java index 92893da..c115847 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java @@ -13,6 +13,8 @@ @ApiModel @Data public class CertificateReportApprovalListRequest extends BaseApprovalListRequest { + @ApiModelProperty(value = "委托方id", dataType = "String") + private Long customerId; @ApiModelProperty(value = "证书报告编号", dataType = "String") private String certificateReportNo; diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml index 46508b3..767695d 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml @@ -46,6 +46,7 @@ SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name FROM biz_business_certificate_report bcr LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id) + LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id WHERE 1=1 @@ -54,6 +55,9 @@ and bcr.create_user_id = #{request.createUserId} + + and boi.customer_id = #{request.customerId} + and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml index c9db367..3049b54 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml @@ -7,6 +7,8 @@ + + @@ -55,7 +57,7 @@ - id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time + id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java index 92893da..c115847 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java @@ -13,6 +13,8 @@ @ApiModel @Data public class CertificateReportApprovalListRequest extends BaseApprovalListRequest { + @ApiModelProperty(value = "委托方id", dataType = "String") + private Long customerId; @ApiModelProperty(value = "证书报告编号", dataType = "String") private String certificateReportNo; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java index 5201d7b..499760a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java @@ -17,6 +17,9 @@ @ApiModelProperty(value = "任务单编号", dataType = "String") private String orderNo; + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml index 46508b3..767695d 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml @@ -46,6 +46,7 @@ SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name FROM biz_business_certificate_report bcr LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id) + LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id WHERE 1=1 @@ -54,6 +55,9 @@ and bcr.create_user_id = #{request.createUserId} + + and boi.customer_id = #{request.customerId} + and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml index c9db367..3049b54 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml @@ -7,6 +7,8 @@ + + @@ -55,7 +57,7 @@ - id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time + id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java index 92893da..c115847 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java @@ -13,6 +13,8 @@ @ApiModel @Data public class CertificateReportApprovalListRequest extends BaseApprovalListRequest { + @ApiModelProperty(value = "委托方id", dataType = "String") + private Long customerId; @ApiModelProperty(value = "证书报告编号", dataType = "String") private String certificateReportNo; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java index 5201d7b..499760a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java @@ -17,6 +17,9 @@ @ApiModelProperty(value = "任务单编号", dataType = "String") private String orderNo; + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java index ec4e997..f9aa69e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java @@ -17,6 +17,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; /** @@ -59,6 +60,29 @@ @TableField("outsourcer_name") private String outsourcerName; + @NotEmpty(message = "实验室代码不能为空") + @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE) + @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String") + @TableField("lab_code") + private String labCode; + + @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String") + @TableField(exist = false) + private String labCodeName; + + /** + * 组别代码 + */ + @NotEmpty(message = "组别代码不能为空") + @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE) + @ApiModelProperty(value = "组别代码(字典code)", dataType = "String") + @TableField("group_code") + private String groupCode; + + @ApiModelProperty(value = "组别代码(字典value)", dataType = "String") + @TableField(exist = false) + private String groupCodeName; + /** * 单位简称 */ diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml index 46508b3..767695d 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml @@ -46,6 +46,7 @@ SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name FROM biz_business_certificate_report bcr LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id) + LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id WHERE 1=1 @@ -54,6 +55,9 @@ and bcr.create_user_id = #{request.createUserId} + + and boi.customer_id = #{request.customerId} + and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml index c9db367..3049b54 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml @@ -7,6 +7,8 @@ + + @@ -55,7 +57,7 @@ - id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time + id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java index 92893da..c115847 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java @@ -13,6 +13,8 @@ @ApiModel @Data public class CertificateReportApprovalListRequest extends BaseApprovalListRequest { + @ApiModelProperty(value = "委托方id", dataType = "String") + private Long customerId; @ApiModelProperty(value = "证书报告编号", dataType = "String") private String certificateReportNo; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java index 5201d7b..499760a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java @@ -17,6 +17,9 @@ @ApiModelProperty(value = "任务单编号", dataType = "String") private String orderNo; + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java index ec4e997..f9aa69e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java @@ -17,6 +17,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; /** @@ -59,6 +60,29 @@ @TableField("outsourcer_name") private String outsourcerName; + @NotEmpty(message = "实验室代码不能为空") + @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE) + @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String") + @TableField("lab_code") + private String labCode; + + @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String") + @TableField(exist = false) + private String labCodeName; + + /** + * 组别代码 + */ + @NotEmpty(message = "组别代码不能为空") + @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE) + @ApiModelProperty(value = "组别代码(字典code)", dataType = "String") + @TableField("group_code") + private String groupCode; + + @ApiModelProperty(value = "组别代码(字典value)", dataType = "String") + @TableField(exist = false) + private String groupCodeName; + /** * 单位简称 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java index 82952ad..d8d2c6a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java @@ -35,6 +35,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -209,13 +210,16 @@ private QueryWrapper listParamWrapperBuilder(OrderListRequest request) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo()); + wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId()); wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer()); wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName()); - wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()), - "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]); - wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()), - "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]); + if(StringUtils.isNotBlank(request.getCreateStartTime())){ + wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]); + } + if(StringUtils.isNotBlank(request.getCreateEndTime())){ + wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]); + } wrapper.orderByDesc("create_time"); return wrapper; } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml index 46508b3..767695d 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml @@ -46,6 +46,7 @@ SELECT bcr.*, bosr.sample_no, bosr.sample_name, bosr.sample_model, rsi.staff_name FROM biz_business_certificate_report bcr LEFT JOIN biz_business_order_sample_relation bosr ON (bosr.order_id = bcr.order_id AND bosr.sample_id = bcr.sample_id) + LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id LEFT JOIN biz_resource_staff_info rsi ON rsi.id = bcr.measure_person_id WHERE 1=1 @@ -54,6 +55,9 @@ and bcr.create_user_id = #{request.createUserId} + + and boi.customer_id = #{request.customerId} + and bcr.certificate_report_no like concat('%',#{request.certificateReportNo},'%') diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml index c9db367..3049b54 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOutsourcerInfoMapper.xml @@ -7,6 +7,8 @@ + + @@ -55,7 +57,7 @@ - id, outsourcer_no, outsourcer_name, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time + id, outsourcer_no, outsourcer_name, lab_code, group_code, outsourcer_brief_name, outsourcer_size, business_size, grade, evaluation, tax_number, bank_account, bank_name, bank_account_number, postal_code, director, phone, fax, mobile, email, website, address_country, address_province, address_city, address_area, full_address, address_country_name, address_province_name, address_city_name, address_area_name, invoice_country, invoice_province, invoice_city, invoice_area, invoice_full_address, invoice_country_name, invoice_province_name, invoice_city_name, invoice_area_name, business_scope, business_content, minio_file_name, approval_status, process_id, remark, create_user_id, create_user_name, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java index 92893da..c115847 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/certificate/CertificateReportApprovalListRequest.java @@ -13,6 +13,8 @@ @ApiModel @Data public class CertificateReportApprovalListRequest extends BaseApprovalListRequest { + @ApiModelProperty(value = "委托方id", dataType = "String") + private Long customerId; @ApiModelProperty(value = "证书报告编号", dataType = "String") private String certificateReportNo; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java index 5201d7b..499760a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java @@ -17,6 +17,9 @@ @ApiModelProperty(value = "任务单编号", dataType = "String") private String orderNo; + @ApiModelProperty(value = "委托方id", dataType = "Long") + private Long customerId; + @ApiModelProperty(value = "委托方名称", dataType = "String") private String customerName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java index ec4e997..f9aa69e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOutsourcerInfo.java @@ -17,6 +17,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.io.Serializable; /** @@ -59,6 +60,29 @@ @TableField("outsourcer_name") private String outsourcerName; + @NotEmpty(message = "实验室代码不能为空") + @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE) + @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String") + @TableField("lab_code") + private String labCode; + + @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String") + @TableField(exist = false) + private String labCodeName; + + /** + * 组别代码 + */ + @NotEmpty(message = "组别代码不能为空") + @DictCodeField(message = "组别代码描述不合法", cacheName = MeterDictCode.GROUP_CODE) + @ApiModelProperty(value = "组别代码(字典code)", dataType = "String") + @TableField("group_code") + private String groupCode; + + @ApiModelProperty(value = "组别代码(字典value)", dataType = "String") + @TableField(exist = false) + private String groupCodeName; + /** * 单位简称 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java index 82952ad..d8d2c6a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOrderInfoServiceImpl.java @@ -35,6 +35,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -209,13 +210,16 @@ private QueryWrapper listParamWrapperBuilder(OrderListRequest request) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.like(StringUtils.isNotBlank(request.getOrderNo()), "order_no", request.getOrderNo()); + wrapper.like(Objects.nonNull(request.getCustomerId()), "customer_id", request.getCustomerId()); wrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName()); wrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer()); wrapper.like(StringUtils.isNotBlank(request.getCreateUserName()), "create_user_name", request.getCreateUserName()); - wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()), - "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]); - wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()), - "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]); + if(StringUtils.isNotBlank(request.getCreateStartTime())){ + wrapper.apply("{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]); + } + if(StringUtils.isNotBlank(request.getCreateEndTime())){ + wrapper.apply("{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateEndTime().split(" ")[0]); + } wrapper.orderByDesc("create_time"); return wrapper; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java index 921491c..8aadad7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessOutsourcerInfoServiceImpl.java @@ -7,7 +7,8 @@ import com.casic.missiles.dto.business.outsource.OutsourcerInfoApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourcerSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; -import com.casic.missiles.enums.PrefixCodeEnum; +import com.casic.missiles.enums.NoGenerateFileCodeEnum; +import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessOutsourcerInfoMapper; @@ -19,7 +20,7 @@ import com.casic.missiles.service.business.IBizBusinessOutsourcerInfoService; import com.casic.missiles.service.business.IBizBusinessOutsourcerUserInfoService; import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.NumberGeneratorUtil; +import com.casic.missiles.utils.NoGeneratorUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -43,8 +44,10 @@ @Override public ReturnDTO saveOutsourcer(BizBusinessOutsourcerInfo request) { //生成编号 + String labCode = request.getLabCode(); + String groupCode = request.getGroupCode(); Long maxNo = this.baseMapper.selectMaxNo(); - String outsourcerNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.OUTSOURCER_PREFIX, maxNo); + String outsourcerNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.D, labCode, NoGenerateRecordTypeCodeEnum.OUTSOURCE_INFO, groupCode, maxNo); request.setOutsourcerNo(outsourcerNo); request.setCreateUserId(request.getUserId()); request.setCreateUserName(request.getUserName());