Browse code 20240329 新增设备管理和外送管理部分需求，修改现场问题，版本号更新为1.3.1.2 dev
1 parent 6c8ccda commit c96e0b78ea2ec8a60548db435e484415a18f6cc7 zhangyingjie authored on 29 Mar 2024

Showing 46 changed files

• casic-metering-common/pom.xml
• casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java
• casic-metering-common/src/main/java/com/casic/missiles/utils/FileUtil.java
• casic-metering-common/src/main/java/com/casic/missiles/utils/MinioUtil.java
• casic-metering-dao/pom.xml
• casic-metering-dao/src/main/java/com/casic/missiles/mapper/subcontract/SubcontractCertificateMapper.java
• casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml
• casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml
• casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml
• casic-metering-eqpt-api/pom.xml
• casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
• casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java
• casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java
• casic-metering-job/pom.xml
• casic-metering-model/pom.xml
• casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
• casic-metering-model/src/main/java/com/casic/missiles/dto/certificate/SubcontractCertificateImportDTO.java
• casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentExportDTO.java
• casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentImportDTO.java
• casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentQueryForm.java
• casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindQueryForm.java
• casic-metering-model/src/main/java/com/casic/missiles/model/board/BoardMessage.java
• casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java
• casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java
• casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfoApproval.java
• casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java
• casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java
• casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrderRelation.java
• casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/Subcontractor.java
• casic-metering-service/pom.xml
• casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java
• casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java
• casic-metering-service/src/main/java/com/casic/missiles/service/impl/CommonApprovalServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentMaintainServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderRelationServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemRfidServiceImpl.java
• casic-metering-service/src/main/java/com/casic/missiles/service/subcontract/ISubcontractCertificateService.java
• casic-metering-service/src/main/java/com/casic/missiles/service/subcontract/ISubcontractOrderRelationService.java
• pom.xml

Ignore Space Show notes View casic-metering-common/pom.xml

Ignore Space Show notes View casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java

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

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

Ignore Space Show notes View casic-metering-dao/pom.xml

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

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

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

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

Ignore Space Show notes View casic-metering-eqpt-api/pom.xml

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

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

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

Ignore Space Show notes View casic-metering-job/pom.xml

Ignore Space Show notes View casic-metering-model/pom.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/certificate/SubcontractCertificateImportDTO.java

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View casic-metering-service/pom.xml

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

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

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

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

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentBorrowServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentMaintainServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/impl/status/EquipmentStatusApprovalServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderRelationServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractorServiceImpl.java

Ignore Space Show notes View casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemRfidServiceImpl.java

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

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

Ignore Space Show notes View pom.xml

Show line notes below