Browse code Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/wangpeng/casic-metering into dev Conflicts: casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java dev release
commit 0dc992cc6bf9408bd3f726665a14e585998a7c5d 2 parents fde845e + 76a7599 casic_zt authored on 10 Mar 2023

Showing 33 changed files

• casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
• casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
• casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
• casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
• casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java
• casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
• casic-metering-common/src/main/java/com/casic/missiles/listeners/NotifyStatusPostProcessor.java
• casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
• casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateStateStatusPostProcessor.java
• casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentApplyStatusPostProcessor.java
• casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentLeaseStatusPostProcessor.java
• casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentManagingStatusPostProcessor.java
• casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupporteStatusPostProcessor.java
• casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
• casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
• casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
• casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
• casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
• casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
• casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
• casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
• casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
• casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
• casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
• casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java
• casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java
• casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/NotifyEventStatusDTO.java
• casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java
• casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java

Ignore Space Show notes View casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java

Ignore Space Show notes View casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java

Ignore Space Show notes View casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java

Ignore Space Show notes View casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java

Ignore Space Show notes View casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java 0 → 100644

Ignore Space Show notes View casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java 0 → 100644

Ignore Space Show notes View casic-metering-common/src/main/java/com/casic/missiles/listeners/NotifyStatusPostProcessor.java 0 → 100644

Ignore Space Show notes View casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java

Ignore Space Show notes View casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/CertificateStateStatusPostProcessor.java 0 → 100644

Ignore Space Show notes View casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentApplyStatusPostProcessor.java 0 → 100644

Ignore Space Show notes View casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentLeaseStatusPostProcessor.java 0 → 100644

Ignore Space Show notes View casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentManagingStatusPostProcessor.java 0 → 100644

Ignore Space Show notes View casic-metering-common/src/main/java/com/casic/missiles/listeners/processor/EquipmentSupporteStatusPostProcessor.java 0 → 100644

Ignore Space Show notes View casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java

Ignore Space Show notes View casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java

Show notes View casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java 100644 → 0

Ignore Space Show notes View casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml

Ignore Space Show notes View casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml

Ignore Space Show notes View casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml

Ignore Space Show notes View casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java 0 → 100644

Show notes View casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java 100644 → 0

Ignore Space Show notes View casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/NotifyEventStatusDTO.java 0 → 100644

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java

Show line notes below