diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index 16f954a..53ae131 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -4,9 +4,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root - password: 123456 + password: Casic203 redis: host: 111.198.10.15 port: 11412 diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index 16f954a..53ae131 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -4,9 +4,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root - password: 123456 + password: Casic203 redis: host: 111.198.10.15 port: 11412 diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml index 56a707f..687db84 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml @@ -107,7 +107,7 @@ SELECT bcr.id AS certificationId, bcr.certificate_no AS certificateReportNo, bcr.certificate_name AS certificateReportName, bcr.trace_date AS calibrationTime, bcr.measure_valid_date AS expirationDate, bcr.certificate_file AS certificateReportFile FROM biz_business_device_measure_approval bcr - JOIN biz_business_device_measure_info bbdmi ON bcr.data_id = bcr.id + JOIN biz_business_device_measure_info bbdmi ON bcr.data_id = bbdmi.id JOIN ( select id from biz_business_order_info @@ -127,7 +127,7 @@ SELECT bcr.id AS certificateId, bcr.certificate_no AS certificateReportNo, bcr.certificate_name AS certificateReportName, bcr.create_time AS submitTime, bcr.update_time AS finishedTime, bcr.approval_status AS certificateStatus, ms.staff_name AS staffName FROM biz_business_device_measure_approval bcr - JOIN biz_business_device_measure_info bbdmi ON bcr.data_id = bcr.id + JOIN biz_business_device_measure_info bbdmi ON bcr.data_id = bbdmi.id LEFT JOIN biz_resource_staff_info ms ON bbdmi.measure_person_id = ms.id WHERE 1=1 diff --git a/casic-metering-api/src/main/resources/config/application-dev.yml b/casic-metering-api/src/main/resources/config/application-dev.yml index 16f954a..53ae131 100644 --- a/casic-metering-api/src/main/resources/config/application-dev.yml +++ b/casic-metering-api/src/main/resources/config/application-dev.yml @@ -4,9 +4,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://111.198.10.15:11336/casic_metering_xichang?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root - password: 123456 + password: Casic203 redis: host: 111.198.10.15 port: 11412 diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml index 56a707f..687db84 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml @@ -107,7 +107,7 @@ SELECT bcr.id AS certificationId, bcr.certificate_no AS certificateReportNo, bcr.certificate_name AS certificateReportName, bcr.trace_date AS calibrationTime, bcr.measure_valid_date AS expirationDate, bcr.certificate_file AS certificateReportFile FROM biz_business_device_measure_approval bcr - JOIN biz_business_device_measure_info bbdmi ON bcr.data_id = bcr.id + JOIN biz_business_device_measure_info bbdmi ON bcr.data_id = bbdmi.id JOIN ( select id from biz_business_order_info @@ -127,7 +127,7 @@ SELECT bcr.id AS certificateId, bcr.certificate_no AS certificateReportNo, bcr.certificate_name AS certificateReportName, bcr.create_time AS submitTime, bcr.update_time AS finishedTime, bcr.approval_status AS certificateStatus, ms.staff_name AS staffName FROM biz_business_device_measure_approval bcr - JOIN biz_business_device_measure_info bbdmi ON bcr.data_id = bcr.id + JOIN biz_business_device_measure_info bbdmi ON bcr.data_id = bbdmi.id LEFT JOIN biz_resource_staff_info ms ON bbdmi.measure_person_id = ms.id WHERE 1=1 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java index 0bd2fa2..6086e26 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java @@ -26,6 +26,7 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; import static com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum.*; @@ -65,6 +66,14 @@ @Override public Page listPage(Page page, CheckInfoListRequest request) { Page checkInfoPage = this.baseMapper.selectListPage(page, request); + if(Objects.nonNull(checkInfoPage) && !CollectionUtils.isEmpty(checkInfoPage.getRecords())){ + checkInfoPage.getRecords().stream().forEach(checkInfo -> { + //核查标准设备 + List checkInfoEquipments = checkInfoEquipmentMapper.selectListByDataId(checkInfo.getId()); + checkInfo.setCheckEquipmentName(checkInfoEquipments.stream().map(BizEquipmentInfo::getEquipmentName).collect(Collectors.joining(","))); + checkInfo.setCheckEquipmentModel(checkInfoEquipments.stream().map(BizEquipmentInfo::getModel).collect(Collectors.joining(","))); + }); + } return checkInfoPage; }